diff --git a/src/main/lombok/com/restfb/types/User.java b/src/main/lombok/com/restfb/types/User.java index cdfe6cd12..bb041f074 100644 --- a/src/main/lombok/com/restfb/types/User.java +++ b/src/main/lombok/com/restfb/types/User.java @@ -161,43 +161,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook private String quotes; - /** - * The user's blurb that appears under their profile picture. - * - * @deprecated since breaking change on 4 April, 2018 - * - * @return The user's blurb that appears under their profile picture. - */ - @Getter - @Setter - @Facebook - @Deprecated - private String about; - - /** - * The user's relationship status. - * - * @return The user's relationship status. - * @deprecated since breaking change on 4 April, 2018 - */ - @Getter - @Setter - @Facebook("relationship_status") - @Deprecated - private String relationshipStatus; - - /** - * The user's religion. - * - * @return The user's religion. - * @deprecated since breaking change on 4 April, 2018 - */ - @Getter - @Setter - @Facebook - @Deprecated - private String religion; - /** * Unspecific age range that this person's age fits into. * @@ -208,18 +171,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook("age_range") private AgeRange ageRange; - /** - * A link to the user's personal website. - * - * @return A link to the user's personal website. - * @deprecated since breaking change on 4 April, 2018 - */ - @Getter - @Setter - @Facebook - @Deprecated - private String website; - /** * The user's birthday as a {@code String}. *

@@ -279,18 +230,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook("video_upload_limits") private VideoUploadLimits videoUploadLimits; - /** - * Can the viewer send a gift to this person? - * - * @deprecated Will be deprecated in all versions on Nov, 2020. - * @return Can the viewer send a gift to this person? - */ - @Getter - @Setter - @Facebook("viewer_can_send_gift") - @Deprecated - private Boolean viewerCanSendGift; - /** * The user's gender. * @@ -301,18 +240,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook private String gender; - /** - * The user's political affiliation. - * - * @return The user's political affiliation. - * @deprecated since breaking change on 4 April, 2018 - */ - @Getter - @Setter - @Facebook - @Deprecated - private String political; - /** * The user's locale. * @@ -323,19 +250,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook private String locale; - /** - * The user's Facebook username. - * - * @return The user's Facebook username. - * @since 1.6.5 - * @deprecated since graph api 2.0 - */ - @Deprecated - @Getter - @Setter - @Facebook - private String username; - /** * The person's PGP public key * @@ -402,18 +316,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook private NamedFacebookType location; - /** - * Security settings - * - * @deprecated Will be deprecated in all versions on Nov, 2020. - * @return Security settings - */ - @Getter - @Setter - @Facebook("security_settings") - @Deprecated - private SecuritySettings securitySettings; - /** * The time that the shared loginneeds to be upgraded to Business Manager by * @@ -434,18 +336,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook("significant_other") private NamedFacebookType significantOther; - /** - * Platform test group - * - * @return Platform test group - * @deprecated Will be deprecated in all versions on Nov, 2020. - */ - @Getter - @Setter - @Facebook("test_group") - @Deprecated - private Long testGroup; - /** * Date the user's profile was updated. * @@ -512,18 +402,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook private Boolean installed; - /** - * Is this a shared login (e.g. a gray user) - * - * @deprecated Will be deprecated in all versions on Nov, 2020. - * @return Is this a shared login (e.g. a gray user) - */ - @Getter - @Setter - @Facebook("is_shared_login") - @Deprecated - private Boolean isSharedLogin; - /** * People with large numbers of followers can have the authenticity of their identity manually verified by Facebook. * This field indicates whether the person's profile is verified in this way. @@ -537,24 +415,12 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov @Facebook("is_verified") private Boolean isVerified; - @Deprecated - @Facebook("interested_in") - private List interestedIn = new ArrayList<>(); - @Facebook("meeting_for") private List meetingFor = new ArrayList<>(); @Facebook private List devices = new ArrayList<>(); - @Facebook - @Deprecated - private List work = new ArrayList<>(); - - @Facebook - @Deprecated - private List education = new ArrayList<>(); - @Facebook private List sports = new ArrayList<>(); @@ -587,176 +453,6 @@ public class User extends NamedFacebookType implements HasProfilePicture, HasCov private static final long serialVersionUID = 1L; - /** - * Represents the Education Graph API type. - * - * @author Mark Allen - * @author Patrick Alberts - * @deprecated since breaking change on 4 April, 2018 - */ - @Deprecated - public static class Education extends AbstractFacebookType { - - /** - * The school name and ID. - * - * @return The school name and ID. - */ - @Getter - @Setter - @Facebook - private NamedFacebookType school; - - /** - * Graduation year. - * - * @return Graduation year. - */ - @Getter - @Setter - @Facebook - private NamedFacebookType year; - - /** - * Description for this year. - * - * It is possible for Facebook to return either this value or {@link #getYear()}. If {@link #getYear()} returns - * {@code null}, then check this method to see if it has data, e.g. {@code "1997"}. - * - * @return Description for this year. - * @since 1.7.1 - */ - @Getter - @Setter - @Facebook("year") - private String yearAsString; - - /** - * Degree acquired. - * - * @return Degree acquired. - */ - @Getter - @Setter - @Facebook - private NamedFacebookType degree; - - /** - * Type of school, e.g. {@code College}. - * - * @return Type of school. - */ - @Getter - @Setter - @Facebook - private String type; - - @Facebook - private List concentration = new ArrayList<>(); - - @Facebook - private List with = new ArrayList<>(); - - @Facebook - private List classes = new ArrayList<>(); - - private static final long serialVersionUID = 2L; - - /** - * Concentrations/minors. - * - * @return Concentrations/minors. - */ - public List getConcentration() { - return unmodifiableList(concentration); - } - - public boolean addConcentration(NamedFacebookType minor) { - return concentration.add(minor); - } - - public boolean removeConcentration(NamedFacebookType minor) { - return concentration.remove(minor); - } - - /** - * Friends associated with this school. - * - * @return Friends associated with this school. - * @since 1.6.3 - */ - public List getWith() { - return unmodifiableList(with); - } - - public boolean addWith(NamedFacebookType friend) { - return with.add(friend); - } - - public boolean removeWith(NamedFacebookType friend) { - return with.remove(friend); - } - - /** - * Classes taken at this school. - * - * @return Classes taken at this school. - * @since 1.6.8 - */ - public List getClasses() { - return unmodifiableList(classes); - } - - public boolean addClasses(EducationClass eduClass) { - return classes.add(eduClass); - } - - public boolean removeClasses(EducationClass eduClass) { - return classes.remove(eduClass); - } - } - - /** - * Represents the Class Graph API type. - * - * @author Mark Allen - * @since 1.6.8 - */ - public static class EducationClass extends NamedFacebookType { - @Facebook - private List with = new ArrayList<>(); - - /** - * The description of this class. - * - * @return The description of this class. - */ - @Getter - @Setter - @Facebook - private String description; - - private static final long serialVersionUID = 1L; - - /** - * Friends associated with this class. - * - * @return Friends associated with this class. - */ - public List getWith() { - return unmodifiableList(with); - } - - public boolean addWith(NamedFacebookType friend) { - return with.add(friend); - } - - public boolean removeWith(NamedFacebookType friend) { - return with.remove(friend); - } - - } - /** * Represents the Sport Graph API type. * @@ -981,43 +677,6 @@ public boolean removeIdsForPages(UserIDForPage userId) { return idsForPages.remove(userId); } - /** - * The genders the user is interested in. - * - * @return The genders the user is interested in. - * @deprecated since breaking change on 4 April, 2018 - */ - @Deprecated - public List getInterestedIn() { - return unmodifiableList(interestedIn); - } - - /** - * Add a gender the user is interested in. - * - * @param gender - * the gender that should be added - * @deprecated since breaking change on 4 April, 2018 - * @return {@code true} if the gender could be added - */ - @Deprecated - public boolean addInterestedIn(String gender) { - return interestedIn.add(gender); - } - - /** - * Remove a gender the user is interested in. - * - * @param gender - * the gender that should be removed - * @deprecated since breaking change on 4 April, 2018 - * @return {@code true} if the gender could be removed - */ - @Deprecated - public boolean removeInterestedIn(String gender) { - return interestedIn.remove(gender); - } - /** * What genders the user is interested in meeting. * @@ -1035,43 +694,6 @@ public boolean removeMeetingFor(String gender) { return meetingFor.remove(gender); } - /** - * A list of the work history from the user's profile. - * - * @return A list of the work history from the user's profile. - * @deprecated since breaking change on 4 April, 2018 - */ - @Deprecated - public List getWork() { - return unmodifiableList(work); - } - - /** - * Adds the {@link WorkExperience} from the work experience list - * - * @param workHistoryItem - * the WorkExperience that should be added - * @deprecated since breaking change on 4 April, 2018 - * @return {@code true} if the {@link WorkExperience} could be added - */ - @Deprecated - public boolean addWork(WorkExperience workHistoryItem) { - return work.add(workHistoryItem); - } - - /** - * Removes the {@link WorkExperience} from the work experience list - * - * @param workHistoryItem - * the WorkExperience that should be removed - * @deprecated since breaking change on 4 April, 2018 - * @return {@code true} if the {@link WorkExperience} could be removed - */ - @Deprecated - public boolean removeWork(WorkExperience workHistoryItem) { - return work.remove(workHistoryItem); - } - /** * The list of devices the person is using. * @@ -1091,43 +713,6 @@ public boolean removeDevice(UserDevice device) { return devices.remove(device); } - /** - * A list of the education history from the user's profile. - * - * @return A list of the education history from the user's profile. - * @deprecated since breaking change on 4 April, 2018 - */ - @Deprecated - public List getEducation() { - return unmodifiableList(education); - } - - /** - * Adds the {@link Education} from the education list - * - * @param educationHistoryItem - * the Education that should be added - * @deprecated since breaking change on 4 April, 2018 - * @return {@code true} if the {@link Education} could be added - */ - @Deprecated - public boolean addEducation(Education educationHistoryItem) { - return education.add(educationHistoryItem); - } - - /** - * Removes the {@link Education} from the education list - * - * @param educationHistoryItem - * the Education that should be removed - * @deprecated since breaking change on 4 April, 2018 - * @return {@code true} if the {@link Education} could be removed - */ - @Deprecated - public boolean removeEducation(Education educationHistoryItem) { - return education.remove(educationHistoryItem); - } - /** * A list of the sports from the user's profile. * @@ -1248,24 +833,6 @@ public boolean removeInvitableFriend(UserInvitableFriend friend) { return invitableFriends.remove(friend); } - /** - * Represents the Security - * Settings Graph API type - */ - public static class SecuritySettings extends AbstractFacebookType { - - /** - * Secure browsing settings - * - * @return Secure browsing settings - */ - @Getter - @Setter - @Facebook("secure_browsing") - private SecureBrowsing secureBrowsing; - - } - /** * Represents the Secure Browsing * Graph API type. diff --git a/src/main/lombok/com/restfb/types/WorkExperience.java b/src/main/lombok/com/restfb/types/WorkExperience.java deleted file mode 100644 index 24fde789e..000000000 --- a/src/main/lombok/com/restfb/types/WorkExperience.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2010-2021 Mark Allen, Norbert Bartels. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.restfb.types; - -import static com.restfb.util.DateUtils.toDateFromShortFormat; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -import com.restfb.Facebook; -import com.restfb.JsonMapper; - -import lombok.Getter; -import lombok.Setter; - -/** - * Represents the Work - * Experience type - * - * @deprecated since breaking change on 4 April, 2018 - */ -@Deprecated -public class WorkExperience extends FacebookType { - - private static final long serialVersionUID = 1L; - - @Getter - @Setter - @Facebook - private String description; - - @Getter - @Setter - @Facebook - private Page employer; - - @Getter - @Setter - private Date endDate; - - @Facebook("end_date") - private transient String rawEndDate; - - @Getter - @Setter - @Facebook - private User from; - - @Getter - @Setter - @Facebook - private Page location; - - @Getter - @Setter - @Facebook - private Page position; - - @Facebook - private List projects = new ArrayList<>(); - - @Getter - @Setter - private Date startDate; - - @Facebook("start_date") - private transient String rawStartDate; - - @Facebook - private List with = new ArrayList<>(); - - @JsonMapper.JsonMappingCompleted - void convertTime() { - startDate = toDateFromShortFormat(rawStartDate); - endDate = toDateFromShortFormat(rawEndDate); - } - - public List getWith() { - return Collections.unmodifiableList(with); - } - - public boolean addWith(User withUser) { - return with.add(withUser); - } - - public boolean removeWith(User withUser) { - return with.remove(withUser); - } - - public List getProjects() { - return Collections.unmodifiableList(projects); - } - - public boolean addProject(ProjectExperience projectExperience) { - return projects.add(projectExperience); - } - - public boolean removeProject(ProjectExperience projectExperience) { - return projects.remove(projectExperience); - } -} diff --git a/src/test/java/com/restfb/types/EducationTest.java b/src/test/java/com/restfb/types/EducationTest.java deleted file mode 100644 index cd4e007ac..000000000 --- a/src/test/java/com/restfb/types/EducationTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2010-2021 Mark Allen, Norbert Bartels. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.restfb.types; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - -import org.junit.jupiter.api.Test; - -import com.restfb.AbstractJsonMapperTests; - -class EducationTest extends AbstractJsonMapperTests { - - @Test - void checkV2_2_StringYear() { - User.Education exampleEducation = - createJsonMapper().toJavaObject(jsonFromClasspath("v2_2/education"), User.Education.class); - - assertNull(exampleEducation.getYear()); - assertEquals("1997", exampleEducation.getYearAsString()); - - } - - @Test - void checkV2_2_NamedYear() { - User.Education exampleEducation = - createJsonMapper().toJavaObject(jsonFromClasspath("v2_2/education-year-named"), User.Education.class); - - assertEquals("2006", exampleEducation.getYear().getName()); - } -} \ No newline at end of file diff --git a/src/test/java/com/restfb/types/UserTest.java b/src/test/java/com/restfb/types/UserTest.java index 5b6dae387..49e16e947 100644 --- a/src/test/java/com/restfb/types/UserTest.java +++ b/src/test/java/com/restfb/types/UserTest.java @@ -80,19 +80,6 @@ void checkCoverPhoto() { exampleUser.getCover().getSource()); } - @Test - void userWorkDates() { - User exampleUser = createJsonMapper().toJavaObject(jsonFromClasspath("v2_5/user-work"), User.class); - assertNotNull(exampleUser); - List workList = exampleUser.getWork(); - assertEquals(1, workList.size()); - WorkExperience work = workList.get(0); - assertNotNull(work.getStartDate()); - assertEquals(1193875200000L, work.getStartDate().getTime()); - assertNotNull(work.getEndDate()); - assertEquals(1348963200000L, work.getEndDate().getTime()); - } - @Test void userLikes() { User exampleUser = createJsonMapper().toJavaObject(jsonFromClasspath("v2_5/user-likes"), User.class); diff --git a/src/test/java/com/restfb/types/WorkExperienceTest.java b/src/test/java/com/restfb/types/WorkExperienceTest.java deleted file mode 100644 index 4cf7c843a..000000000 --- a/src/test/java/com/restfb/types/WorkExperienceTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2010-2021 Mark Allen, Norbert Bartels. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.restfb.types; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import org.junit.jupiter.api.Test; - -import com.restfb.AbstractJsonMapperTests; - -class WorkExperienceTest extends AbstractJsonMapperTests { - - @Test - void checkV2_8_workexperience() { - WorkExperience experience = - createJsonMapper().toJavaObject(jsonFromClasspath("v2_8/work-experience"), WorkExperience.class); - - assertNotNull(experience); - assertEquals(1193875200000L, experience.getStartDate().getTime()); - assertEquals(1348963200000L, experience.getEndDate().getTime()); - assertEquals("1234567890", experience.getEmployer().getId()); - assertEquals("Example Company", experience.getEmployer().getName()); - assertEquals("Computer Scientist", experience.getPosition().getName()); - assertEquals("108125275875311", experience.getPosition().getId()); - } -} diff --git a/src/test/java/com/restfb/types/api/ApiCheckGenerator.java b/src/test/java/com/restfb/types/api/ApiCheckGenerator.java index 427e88285..63c7c4d30 100644 --- a/src/test/java/com/restfb/types/api/ApiCheckGenerator.java +++ b/src/test/java/com/restfb/types/api/ApiCheckGenerator.java @@ -83,8 +83,6 @@ public void createApiProperties() throws IOException { props.setProperty("Url.methods", joinMethods(fetchMethodsFromClass(Url.class))); props.setProperty("User.methods", joinMethods(fetchMethodsFromClass(User.class))); props.setProperty("User.Currency.methods", joinMethods(fetchMethodsFromClass(User.Currency.class))); - props.setProperty("User.Education.methods", joinMethods(fetchMethodsFromClass(User.Education.class))); - props.setProperty("User.EducationClass.methods", joinMethods(fetchMethodsFromClass(User.EducationClass.class))); props.setProperty("User.Sport.methods", joinMethods(fetchMethodsFromClass(User.Sport.class))); props.setProperty("Video.methods", joinMethods(fetchMethodsFromClass(Video.class))); diff --git a/src/test/java/com/restfb/types/setter/UserTest.java b/src/test/java/com/restfb/types/setter/UserTest.java index d08eab1c3..696acea27 100644 --- a/src/test/java/com/restfb/types/setter/UserTest.java +++ b/src/test/java/com/restfb/types/setter/UserTest.java @@ -47,22 +47,6 @@ void testCurrency() { testInstance(obj); } - @Test - void testEducation() { - User.Education obj = new User.Education(); - addIgnoredField("rawUpdatedTime"); - addIgnoredField("rawCreatedTime"); - testInstance(obj); - } - - @Test - void testEducationClass() { - User.EducationClass obj = new User.EducationClass(); - addIgnoredField("rawUpdatedTime"); - addIgnoredField("rawCreatedTime"); - testInstance(obj); - } - @Test void testSport() { User.Sport obj = new User.Sport(); diff --git a/src/test/java/com/restfb/types/setter/WorkExperienceTest.java b/src/test/java/com/restfb/types/setter/WorkExperienceTest.java deleted file mode 100644 index 3c1fe16e9..000000000 --- a/src/test/java/com/restfb/types/setter/WorkExperienceTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2010-2021 Mark Allen, Norbert Bartels. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.restfb.types.setter; - -import org.junit.jupiter.api.Test; - -import com.restfb.types.WorkExperience; -import com.restfb.types.api.SetterGetterTestBase; - -class WorkExperienceTest extends SetterGetterTestBase { - - @Test - void test() { - WorkExperience obj = new WorkExperience(); - addIgnoredField("rawStartDate"); - addIgnoredField("rawEndDate"); - testInstance(obj); - } -} diff --git a/src/test/resources/json/v2_2/education-year-named.json b/src/test/resources/json/v2_2/education-year-named.json deleted file mode 100644 index 6f9174e08..000000000 --- a/src/test/resources/json/v2_2/education-year-named.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "concentration": [ - { - "id": "112363008776524", - "name": "Computer Science" - } - ], - "school": { - "id": "109826632370208", - "name": "Saarland University" - }, - "type": "College", - "year": { - "id": "137616982934053", - "name": "2006" - } -} \ No newline at end of file diff --git a/src/test/resources/json/v2_2/education.json b/src/test/resources/json/v2_2/education.json deleted file mode 100644 index 74dca2655..000000000 --- a/src/test/resources/json/v2_2/education.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "school": { - "id": "106518946050919", - "name": "Marimallappa's PU College" - }, - "year": 1997, - "type": "College" -} diff --git a/src/test/resources/json/v2_5/user-work.json b/src/test/resources/json/v2_5/user-work.json deleted file mode 100644 index b6adcf032..000000000 --- a/src/test/resources/json/v2_5/user-work.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "work": [ - { - "end_date": "2012-09-30", - "employer": { - "id": "987654321", - "name": "Company 2" - }, - "position": { - "id": "678934252", - "name": "Worker Position" - }, - "start_date": "2007-11-01" - } - ], - "id": "123456789032" -} \ No newline at end of file diff --git a/src/test/resources/json/v2_8/work-experience.json b/src/test/resources/json/v2_8/work-experience.json deleted file mode 100644 index a573b3ba5..000000000 --- a/src/test/resources/json/v2_8/work-experience.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "end_date": "2012-09-30", - "employer": { - "id": "1234567890", - "name": "Example Company" - }, - "position": { - "id": "108125275875311", - "name": "Computer Scientist" - }, - "start_date": "2007-11-01", - "id": "987654321232" -} \ No newline at end of file diff --git a/src/test/resources/pre-1.7-api.properties b/src/test/resources/pre-1.7-api.properties index ce963fc37..5d95d92bd 100644 --- a/src/test/resources/pre-1.7-api.properties +++ b/src/test/resources/pre-1.7-api.properties @@ -13,7 +13,6 @@ DeAuth.methods=getIssuedAt,getUserId,getProfileId,getAlgorithm FacebookType.Metadata.methods=getType,equals,getFields,hashCode,toString,getConnections Message.Attachment.methods=equals,getName,getImageData,hashCode,toString,getSize,getMimeType Photo.methods=getComments,getLink,getPosition,getImages,getSource,getPlace,getBackdatedTime,getTags,getUpdatedTime,getIcon,getLikes,getHeight,getBackdatedTimeGranularity,getPicture,getFrom,getWidth,getCreatedTime -User.Education.methods=getDegree,getClasses,getType,getSchool,equals,getWith,hashCode,getConcentration,toString,getYear MessageTag.methods=getOffset,getLength User.Currency.methods=equals,getCurrencyExchange,getUserCurrency,hashCode,toString,getCurrencyOffset,getCurrencyExchangeInverse Post.Property.methods=getText,equals,getName,hashCode,toString,getHref @@ -38,14 +37,13 @@ ProfilePictureSource.methods=getHeight,getUrl,equals,hashCode,getWidth,toString, Event.Owner.methods=getCategory,equals,getName,hashCode,toString,getCategoryList,getId CategorizedFacebookType.methods=getCategory StatusMessage.methods=getLikes,getMessage,getComments,getFrom,getPlace,getUpdatedTime -User.EducationClass.methods=getDescription,getWith NamedFacebookType.methods=getName Thread.methods=getUnseen,getComments,getTo,getUpdatedTime,getUnread Comment.methods=getAttachment,getLikes,getMessage,getComments,getParent,getCanRemove,getLikeCount,getFrom,getCanComment,getCreatedTime,getUserLikes StoryAttachment.methods=getMedia,getUrl,setUrl Post.Shares.methods=equals,hashCode,toString,getCount Account.methods=getPerms -User.methods=getQuotes,getLink,getEducation,getRelationshipStatus,getVerified,getUpdatedTime,getEmail,getWebsite,getFavoriteTeams,getLastName,getBio,getThirdPartyId,getInterestedIn,getMeetingFor,getMiddleName,getGender,getFavoriteAthletes,getSignificantOther,getLanguages,getCurrency,getAbout,getTimezone,getLocation,getLocale,getHometown,getBirthdayAsDate,getReligion,getPicture,getHometownName,getWork,getBirthday,getUsername,getPolitical,getSports,getFirstName +User.methods=getQuotes,getLink,getVerified,getUpdatedTime,getEmail,getFavoriteTeams,getLastName,getBio,getThirdPartyId,getMeetingFor,getMiddleName,getGender,getFavoriteAthletes,getSignificantOther,getLanguages,getCurrency,getTimezone,getLocation,getLocale,getHometown,getBirthdayAsDate,getPicture,getHometownName,getBirthday,getSports,getFirstName PageConnection.methods=getCreatedTime FacebookType.methods=getType,equals,hashCode,toString,getMetadata,getId Note.methods=getMessage,getComments,getSubject,getFrom,getCreatedTime,getIcon,getUpdatedTime