Skip to content

Commit

Permalink
[Fix] Clearer separation of test setup to help resolving test issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ledsoft
ledsoft committed Dec 17, 2024
1 parent 2d3d4ba commit 29afd48
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main/java/cz/cvut/kbss/jsonld/deserialization/util/ClasspathScanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected void processJarFile(URL jarResource, String packageName) {
}
}
} catch (IOException e) {
LOG.error("Unable to scan classes in JAR file " + jarPath, e);
LOG.error("Unable to scan classes in JAR file {}", jarPath, e);
}
}

Expand Down
18 changes: 13 additions & 5 deletions ...est/java/cz/cvut/kbss/jsonld/deserialization/expanded/ExpandedJsonLdDeserializerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private static Map<URI, User> initUsers() {
@BeforeEach
void setUp() {
final Configuration config = new Configuration();
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment");
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
}
Expand Down Expand Up @@ -343,9 +343,6 @@ void deserializationSupportsObjectsWithBlankNodeIds() throws Exception {

@Test
void deserializationReturnsSubclassInstanceWhenTypesMatch() throws Exception {
final Configuration config = new Configuration();
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithDataProperties.json");
final Person result = sut.deserialize(input, Person.class);
assertInstanceOf(User.class, result);
Expand All @@ -356,6 +353,7 @@ void deserializationSupportsPolymorphismForCollections() throws Exception {
final Configuration config = new Configuration();
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithPluralReference.json");
final PolymorphicOrganization result = sut.deserialize(input, PolymorphicOrganization.class);
Expand All @@ -382,6 +380,7 @@ void deserializationSupportsPolymorphismForAttributes() throws Exception {
final Configuration config = new Configuration();
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithSingularPolymorphicReference.json");
final PolymorphicPerson result = sut.deserialize(input, PolymorphicPerson.class);
Expand All @@ -404,6 +403,7 @@ public PolymorphicPerson() {
void deserializationSupportsDeserializingObjectAsPlainIdentifier() throws Exception {
final Configuration config = new Configuration();
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithSingularPolymorphicReference.json");
Expand All @@ -429,6 +429,7 @@ void deserializationSupportsDeserializingObjectsAsPluralPlainIdentifiers() throw
final Configuration config = new Configuration();
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithPluralReference.json");
final OrganizationWithPlainIdentifiers result =
Expand Down Expand Up @@ -457,6 +458,7 @@ void deserializationHandlesJsonLdListOfValues() throws Exception {
final Configuration config = new Configuration();
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithList.json");
final OrganizationWithListOfMembers result =
Expand Down Expand Up @@ -592,10 +594,10 @@ void deserializationHandlesTypedDataPropertyValues() throws Exception {
void deserializationHandlesObjectPropertyFieldOfTypeObject() throws Exception {
final JsonArray input = readAndExpand("objectWithSingularReference.json");
final Configuration config = new Configuration();
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.TRUE.toString());
// This will prevent problems with multiple classes matching the same type (Organization)
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final GenericMember result = sut.deserialize(input, GenericMember.class);
assertNotNull(result.getMemberOf());
Expand Down Expand Up @@ -646,6 +648,7 @@ void deserializationSupportsPlainObjectReturnType() throws Exception {
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.TRUE.toString());
// This will prevent problems with multiple classes matching the same type (Organization)
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithDataProperties.json");
final Object result = sut.deserialize(input, Object.class);
Expand All @@ -658,6 +661,7 @@ void deserializationUsesProvidedTargetTypeWhenNoTypeIsSpecifiedAndTypeAssumingIs
final Configuration config = new Configuration();
config.set(ConfigParam.ASSUME_TARGET_TYPE, Boolean.TRUE.toString());
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithoutTypes.json");
final User result = sut.deserialize(input, User.class);
Expand Down Expand Up @@ -727,6 +731,7 @@ void deserializationSupportsOptimisticTargetTypeResolution() throws Exception {
final Configuration config = sut.configuration();
config.set(ConfigParam.ENABLE_OPTIMISTIC_TARGET_TYPE_RESOLUTION, Boolean.toString(true));
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithPluralOptimisticallyTypedReference.json");
final StudyOnPersons result = sut.deserialize(input, StudyOnPersons.class);
Expand All @@ -741,6 +746,7 @@ void deserializationSupportsOptimisticTargetTypeResolutionWithSuperclassPreferen
config.set(ConfigParam.PREFER_SUPERCLASS, Boolean.toString(true));
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithPluralOptimisticallyTypedReference.json");
final StudyOnPersons result = sut.deserialize(input, StudyOnPersons.class);
Expand All @@ -753,6 +759,7 @@ void deserializationThrowsAmbiguousTargetTypeExceptionForAmbiguousTargetTypeWith
throws Exception {
final Configuration config = sut.configuration();
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithPluralOptimisticallyTypedReference.json");
assertThrows(AmbiguousTargetTypeException.class, () -> sut.deserialize(input, StudyOnPersons.class));
Expand Down Expand Up @@ -860,6 +867,7 @@ void deserializationUsesProvidedTargetTypeWhenNoTypeIsSpecifiedTypeAssumingIsEna
final Configuration config = new Configuration();
config.set(ConfigParam.ASSUME_TARGET_TYPE, Boolean.TRUE.toString());
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
final JsonArray input = readAndExpand("objectWithSingularReferenceWithIdOnly.json");
final Employee result = sut.deserialize(input, Employee.class);
Expand Down

0 comments on commit 29afd48

Please sign in to comment.