Skip to content

Commit 29afd48

Browse files
ledsoftledsoft
committed
[Fix] Clearer separation of test setup to help resolving test issues.
1 parent 2d3d4ba commit 29afd48

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

‎src/main/java/cz/cvut/kbss/jsonld/deserialization/util/ClasspathScanner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected void processJarFile(URL jarResource, String packageName) {
133133
}
134134
}
135135
} catch (IOException e) {
136-
LOG.error("Unable to scan classes in JAR file " + jarPath, e);
136+
LOG.error("Unable to scan classes in JAR file {}", jarPath, e);
137137
}
138138
}
139139

‎src/test/java/cz/cvut/kbss/jsonld/deserialization/expanded/ExpandedJsonLdDeserializerTest.java

+13-5
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private static Map<URI, User> initUsers() {
109109
@BeforeEach
110110
void setUp() {
111111
final Configuration config = new Configuration();
112-
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment");
112+
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
113113
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
114114
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
115115
}
@@ -343,9 +343,6 @@ void deserializationSupportsObjectsWithBlankNodeIds() throws Exception {
343343

344344
@Test
345345
void deserializationReturnsSubclassInstanceWhenTypesMatch() throws Exception {
346-
final Configuration config = new Configuration();
347-
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
348-
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
349346
final JsonArray input = readAndExpand("objectWithDataProperties.json");
350347
final Person result = sut.deserialize(input, Person.class);
351348
assertInstanceOf(User.class, result);
@@ -356,6 +353,7 @@ void deserializationSupportsPolymorphismForCollections() throws Exception {
356353
final Configuration config = new Configuration();
357354
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
358355
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
356+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
359357
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
360358
final JsonArray input = readAndExpand("objectWithPluralReference.json");
361359
final PolymorphicOrganization result = sut.deserialize(input, PolymorphicOrganization.class);
@@ -382,6 +380,7 @@ void deserializationSupportsPolymorphismForAttributes() throws Exception {
382380
final Configuration config = new Configuration();
383381
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
384382
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
383+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
385384
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
386385
final JsonArray input = readAndExpand("objectWithSingularPolymorphicReference.json");
387386
final PolymorphicPerson result = sut.deserialize(input, PolymorphicPerson.class);
@@ -404,6 +403,7 @@ public PolymorphicPerson() {
404403
void deserializationSupportsDeserializingObjectAsPlainIdentifier() throws Exception {
405404
final Configuration config = new Configuration();
406405
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
406+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
407407
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
408408
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
409409
final JsonArray input = readAndExpand("objectWithSingularPolymorphicReference.json");
@@ -429,6 +429,7 @@ void deserializationSupportsDeserializingObjectsAsPluralPlainIdentifiers() throw
429429
final Configuration config = new Configuration();
430430
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
431431
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
432+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
432433
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
433434
final JsonArray input = readAndExpand("objectWithPluralReference.json");
434435
final OrganizationWithPlainIdentifiers result =
@@ -457,6 +458,7 @@ void deserializationHandlesJsonLdListOfValues() throws Exception {
457458
final Configuration config = new Configuration();
458459
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
459460
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
461+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
460462
this.sut = JsonLdDeserializer.createExpandedDeserializer(config);
461463
final JsonArray input = readAndExpand("objectWithList.json");
462464
final OrganizationWithListOfMembers result =
@@ -592,10 +594,10 @@ void deserializationHandlesTypedDataPropertyValues() throws Exception {
592594
void deserializationHandlesObjectPropertyFieldOfTypeObject() throws Exception {
593595
final JsonArray input = readAndExpand("objectWithSingularReference.json");
594596
final Configuration config = new Configuration();
595-
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
596597
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.TRUE.toString());
597598
// This will prevent problems with multiple classes matching the same type (Organization)
598599
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
600+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
599601
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
600602
final GenericMember result = sut.deserialize(input, GenericMember.class);
601603
assertNotNull(result.getMemberOf());
@@ -646,6 +648,7 @@ void deserializationSupportsPlainObjectReturnType() throws Exception {
646648
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.TRUE.toString());
647649
// This will prevent problems with multiple classes matching the same type (Organization)
648650
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
651+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
649652
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
650653
final JsonArray input = readAndExpand("objectWithDataProperties.json");
651654
final Object result = sut.deserialize(input, Object.class);
@@ -658,6 +661,7 @@ void deserializationUsesProvidedTargetTypeWhenNoTypeIsSpecifiedAndTypeAssumingIs
658661
final Configuration config = new Configuration();
659662
config.set(ConfigParam.ASSUME_TARGET_TYPE, Boolean.TRUE.toString());
660663
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
664+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
661665
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
662666
final JsonArray input = readAndExpand("objectWithoutTypes.json");
663667
final User result = sut.deserialize(input, User.class);
@@ -727,6 +731,7 @@ void deserializationSupportsOptimisticTargetTypeResolution() throws Exception {
727731
final Configuration config = sut.configuration();
728732
config.set(ConfigParam.ENABLE_OPTIMISTIC_TARGET_TYPE_RESOLUTION, Boolean.toString(true));
729733
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
734+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
730735
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
731736
final JsonArray input = readAndExpand("objectWithPluralOptimisticallyTypedReference.json");
732737
final StudyOnPersons result = sut.deserialize(input, StudyOnPersons.class);
@@ -741,6 +746,7 @@ void deserializationSupportsOptimisticTargetTypeResolutionWithSuperclassPreferen
741746
config.set(ConfigParam.PREFER_SUPERCLASS, Boolean.toString(true));
742747
config.set(ConfigParam.IGNORE_UNKNOWN_PROPERTIES, Boolean.toString(true));
743748
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld.environment.model");
749+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
744750
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
745751
final JsonArray input = readAndExpand("objectWithPluralOptimisticallyTypedReference.json");
746752
final StudyOnPersons result = sut.deserialize(input, StudyOnPersons.class);
@@ -753,6 +759,7 @@ void deserializationThrowsAmbiguousTargetTypeExceptionForAmbiguousTargetTypeWith
753759
throws Exception {
754760
final Configuration config = sut.configuration();
755761
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
762+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
756763
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
757764
final JsonArray input = readAndExpand("objectWithPluralOptimisticallyTypedReference.json");
758765
assertThrows(AmbiguousTargetTypeException.class, () -> sut.deserialize(input, StudyOnPersons.class));
@@ -860,6 +867,7 @@ void deserializationUsesProvidedTargetTypeWhenNoTypeIsSpecifiedTypeAssumingIsEna
860867
final Configuration config = new Configuration();
861868
config.set(ConfigParam.ASSUME_TARGET_TYPE, Boolean.TRUE.toString());
862869
config.set(ConfigParam.SCAN_PACKAGE, "cz.cvut.kbss.jsonld");
870+
config.set(ConfigParam.DISABLE_TYPE_MAP_CACHE, "true");
863871
this.sut = ExpandedJsonLdDeserializer.createExpandedDeserializer(config);
864872
final JsonArray input = readAndExpand("objectWithSingularReferenceWithIdOnly.json");
865873
final Employee result = sut.deserialize(input, Employee.class);

0 commit comments

Comments
 (0)