Adds tests for resettable prefab values

Author: jqno

equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/UserPrefabValueProvider.java

@@ -94,6 +94,7 @@ public <T> void register(Class<T> type, T red, T blue, T redCopy) {
         cache.put(type, tuple);
     }
 
+    /** {@inheritDoc} */
     @Override
     public boolean canBeCached(Class<?> type) {
         return !supplierCache.containsKey(type);

equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/CachingValueProviderTest.java

@@ -30,6 +30,19 @@ void useFallbackValueAndCheckCache() {
         assertThat(sut.provide(FALLBACK_TAG, SOME_FIELD)).contains(new Tuple<>(42, 1337, 42));
     }
 
+    @Test
+    void addsToCache() {
+        sut.provide(FALLBACK_TAG, SOME_FIELD);
+        assertThat(cache.get(SOME_FIELD, FALLBACK_TAG)).isEqualTo(new Tuple<>(42, 1337, 42));
+    }
+
+    @Test
+    void dontCacheValueIfCacheDeciderSaysNotTo() {
+        sut = new CachingValueProvider(t -> false, cache, fallback);
+        sut.provide(FALLBACK_TAG, SOME_FIELD);
+        assertThat(cache.get(SOME_FIELD, FALLBACK_TAG)).isNull();
+    }
+
     @Test
     void useCachedValue() {
         cache.put(SOME_FIELD, SOME_TAG, new Tuple<>(1, 2, 1));
@@ -65,7 +78,7 @@ private static final class Fallback implements ValueProvider {
         @Override
         @SuppressWarnings("unchecked")
         public <T> Optional<Tuple<T>> provide(TypeTag tag, String fieldName) {
-            if (int.class.equals(tag.getType())) {
+            if (FALLBACK_TAG.getType().equals(tag.getType())) {
                 return Optional.of((Tuple<T>) new Tuple<>(42, 1337, 42));
             }
             return Optional.empty();

equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/UserPrefabValueProviderTest.java

@@ -20,6 +20,29 @@ public void aRegisteredValueCanBeFound() {
         assertThat(sut.provide(INT, SOME_FIELDNAME)).contains(new Tuple<>(3, 2, 3));
     }
 
+    @Test
+    public void aRegisteredResettableValueCanBeFound() {
+        sut.registerResettable(INT.getType(), () -> 3, () -> 2, () -> 3);
+        assertThat(sut.provide(INT, SOME_FIELDNAME)).contains(new Tuple<>(3, 2, 3));
+    }
+
+    @Test
+    void aNormalValueCanBeCached() {
+        sut.register(INT.getType(), 3, 2, 3);
+        assertThat(sut.canBeCached(INT.getType())).isTrue();
+    }
+
+    @Test
+    void aResettableValueCannotBeCached() {
+        sut.registerResettable(INT.getType(), () -> 3, () -> 2, () -> 3);
+        assertThat(sut.canBeCached(INT.getType())).isFalse();
+    }
+
+    @Test
+    void anUnregisteredValueCanBeCached() {
+        assertThat(sut.canBeCached(INT.getType())).isTrue();
+    }
+
     @Test
     public void fieldNameIsIgnoredWhenFindingAValue() {
         sut.register(INT.getType(), 3, 2, 3);
@@ -45,6 +68,14 @@ public void copy() {
         assertThat(anotherSut.provide(INT, SOME_FIELDNAME)).contains(new Tuple<>(1, 2, 1));
     }
 
+    @Test
+    public void copyResettable() {
+        sut.registerResettable(INT.getType(), () -> 1, () -> 2, () -> 1);
+        UserPrefabValueProvider anotherSut = sut.copy();
+
+        assertThat(anotherSut.provide(INT, SOME_FIELDNAME)).contains(new Tuple<>(1, 2, 1));
+    }
+
     @Test
     public void copyDoesNotReflectLaterChangesToOriginal() {
         sut.register(INT.getType(), 1, 2, 1);

equalsverifier-test/src/test/java/nl/jqno/equalsverifier/integration/operational/ConfiguredEqualsVerifierMultipleTest.java

@@ -156,6 +156,26 @@ void individuallyAddedPrefabValuesAreNotAddedGlobally() {
                 .assertMessageContains("Recursive datastructure");
     }
 
+    @Test
+    void individuallyAddedResettablePrefabValuesAreNotAddedGlobally() {
+        ConfiguredEqualsVerifier ev = EqualsVerifier.configure();
+
+        // should succeed
+        ev
+                .forClasses(RecursiveTypeContainer.class, A.class)
+                .withResettablePrefabValue(
+                    RecursiveType.class,
+                    () -> new RecursiveType(null),
+                    () -> new RecursiveType(new RecursiveType(null)))
+                .verify();
+
+        // PrefabValues are not added to configuration, so should fail
+        ExpectedException
+                .when(() -> ev.forClasses(RecursiveTypeContainer.class, A.class).verify())
+                .assertFailure()
+                .assertMessageContains("Recursive datastructure");
+    }
+
     @Test
     void individuallyAddedGenericPrefabValuesAreNotAddedGlobally() {
         ConfiguredEqualsVerifier ev = EqualsVerifier.configure();