#26227 fixing unit test

dotCMS · Jan 5, 2024 · 4089d95 · 4089d95
1 parent e84868b
commit 4089d95
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 9 deletions.
diff --git a/dotCMS/src/test/java/com/dotcms/util/CollectionsUtilsTest.java b/dotCMS/src/test/java/com/dotcms/util/CollectionsUtilsTest.java
@@ -1,20 +1,13 @@
 package com.dotcms.util;
 
 import com.dotcms.UnitTestBase;
-import com.dotcms.mock.request.DotCMSMockRequest;
-import com.dotcms.mock.request.MockAttributeRequest;
-import com.dotcms.mock.response.DotCMSMockResponse;
-import com.dotcms.mock.response.MockHeaderResponse;
-import com.dotcms.rendering.engine.ScriptEngine;
-import com.dotcms.rendering.engine.ScriptEngineFactory;
 import com.liferay.util.StringPool;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.Serializable;
-import java.io.StringReader;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -411,8 +404,15 @@ public void testConcatPrimitive(){
     @Test
     public void test_toSerializableMap(){
 
-        final ScriptEngine scriptEngine = ScriptEngineFactory.getInstance().getEngine(ScriptEngineFactory.JAVASCRIPT_ENGINE);
-        final Object resultMap = scriptEngine.eval(new DotCMSMockRequest(), new DotCMSMockResponse(), new StringReader(JS_JSON_MAP), Map.of());
+        final Map nonsSerializableMap = new NoSerializableMap();
+        nonsSerializableMap.put("object", new Object());
+        nonsSerializableMap.put("string", "string");
+
+        final Map nonsSerializableMap2 = new NoSerializableMap();
+        nonsSerializableMap2.put("object", new Object());
+        nonsSerializableMap2.put("string", "string");
+        nonsSerializableMap.put("inner", nonsSerializableMap2);
+        final Object resultMap =  CollectionsUtils.toSerializableMap(nonsSerializableMap);
 
         Assert.assertNotNull(resultMap);
         Assert.assertTrue(resultMap instanceof Map);

diff --git a/dotCMS/src/test/java/com/dotcms/util/NoSerializableMap.java b/dotCMS/src/test/java/com/dotcms/util/NoSerializableMap.java
@@ -0,0 +1,81 @@
+package com.dotcms.util;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Dummy implementation to handle a no serialize map
+ */
+public class NoSerializableMap implements Map  {
+
+    private final HashMap map = new HashMap<>();
+
+    @Override
+    public int size() {
+        return map.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return map.containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return map.containsValue(value);
+    }
+
+    @Override
+    public Object get(Object key) {
+        return map.get(key);
+    }
+
+    @Nullable
+    @Override
+    public Object put(Object key, Object value) {
+        return map.put(key, value);
+    }
+
+    @Override
+    public Object remove(Object key) {
+        return map.remove(key);
+    }
+
+    @Override
+    public void putAll(Map m) {
+        map.putAll(m);
+    }
+
+    @Override
+    public void clear() {
+        map.clear();
+    }
+
+    @NotNull
+    @Override
+    public Set keySet() {
+        return map.keySet();
+    }
+
+    @NotNull
+    @Override
+    public Collection values() {
+        return map.values();
+    }
+
+    @NotNull
+    @Override
+    public Set<Entry> entrySet() {
+        return map.entrySet();
+    }
+}