Adds FactoryCache.copy()

jqno · Dec 4, 2024 · c296bb9 · c296bb9
1 parent 2a13d5a
commit c296bb9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/ConfiguredEqualsVerifier.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/ConfiguredEqualsVerifier.java
@@ -51,7 +51,7 @@ private ConfiguredEqualsVerifier(
     public ConfiguredEqualsVerifier copy() {
         return new ConfiguredEqualsVerifier(
             EnumSet.copyOf(warningsToSuppress),
-            new FactoryCache().merge(factoryCache),
+            factoryCache.copy(),
             usingGetClass,
             fieldnameToGetter
         );
@@ -127,7 +127,7 @@ public <T> SingleTypeEqualsVerifierApi<T> forClass(Class<T> type) {
         return new SingleTypeEqualsVerifierApi<>(
             type,
             EnumSet.copyOf(warningsToSuppress),
-            factoryCache,
+            factoryCache.copy(),
             objenesis,
             usingGetClass,
             fieldnameToGetter

diff --git a/...sverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FactoryCache.java b/...sverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FactoryCache.java
@@ -66,6 +66,17 @@ public boolean contains(Class<?> type) {
         return cache.containsKey(type.getName());
     }
 
+    /**
+     * Returns a new {@code FactoryCache} instance containing the factories from {@code this}.
+     *
+     * @return a new instance containing factories from {@code this}
+     */
+    public FactoryCache copy() {
+        FactoryCache result = new FactoryCache();
+        addAll(result, this);
+        return result;
+    }
+
     /**
      * Returns a new {@code FactoryCache} instance containing the factories from {@code this} and
      * from the {@code other} cache.
@@ -75,12 +86,12 @@ public boolean contains(Class<?> type) {
      */
     public FactoryCache merge(FactoryCache other) {
         FactoryCache result = new FactoryCache();
-        copy(result, this);
-        copy(result, other);
+        addAll(result, this);
+        addAll(result, other);
         return result;
     }
 
-    private void copy(FactoryCache to, FactoryCache from) {
+    private void addAll(FactoryCache to, FactoryCache from) {
         for (Map.Entry<String, PrefabValueFactory<?>> entry : from.cache.entrySet()) {
             to.put(entry.getKey(), entry.getValue());
         }

diff --git a/...ifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FactoryCacheTest.java b/...ifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FactoryCacheTest.java
@@ -55,6 +55,16 @@ public void doesntContain() {
         assertFalse(cache.contains(STRING_CLASS));
     }
 
+    @Test
+    public void copy() {
+        cache.put(STRING_CLASS, STRING_FACTORY);
+        FactoryCache copy = cache.copy();
+        copy.put(INT_CLASS, INT_FACTORY);
+        assertTrue(copy.contains(STRING_CLASS));
+        assertFalse(copy == cache);
+        assertFalse(cache.contains(INT_CLASS));
+    }
+
     @Test
     public void merge() {
         FactoryCache a = new FactoryCache();