Fix opendj-server-legacy unit tests. WrenSecurity#71

orchitech · Feb 7, 2023 · 7b54050 · 7b54050
1 parent 0ae27d4
commit 7b54050
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
@@ -24,6 +24,7 @@
 import java.util.TreeSet;
 
 import org.mockito.internal.stubbing.defaultanswers.ReturnsEmptyValues;
+import org.mockito.internal.util.Primitives;
 import org.mockito.invocation.InvocationOnMock;
 
 /**
@@ -89,6 +90,9 @@ public Object answer(InvocationOnMock invocation) {
                 if (defaultValue != null) {
                     return defaultValue;
                 }
+                if (Number.class.isAssignableFrom(invocation.getMethod().getReturnType())) {
+                    return null; // Prevent Mockito's default behavior of returning wrapped 0
+                }
                 return answerFromDefaultMockitoBehavior(invocation);
             } catch (Exception e) {
                 return answerFromDefaultMockitoBehavior(invocation);

diff --git a/...gacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java b/...gacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
@@ -717,7 +717,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable
         returnedEntries.add(invocation.getArgument(0));
         return null;
       }
-    }).when(searchOp).returnEntry(any(Entry.class), any(List.class));
+    }).when(searchOp).returnEntry(any(Entry.class), any());
     return searchOp;
   }
 

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java
@@ -715,8 +715,8 @@ public void testGetAllAttributes() throws Exception
          "modifyTimestamp: 20070101000001Z");
 
     List<String> expectedAttrNames = newArrayList(
-        "cn", "cn;lang-en-US", "sn", "sn;lang-en-US", "givenName", "givenName;lang-en-US", "creatorsName",
-        "createTimestamp", "modifyTimestamp", "modifiersName");
+        "cn", "cn;lang-en-US", "givenName", "givenName;lang-en-US", "sn", "sn;lang-en-US", "creatorsName",
+        "createTimestamp", "modifiersName", "modifyTimestamp");
 
     Iterator<Attribute> allAttrsIt = e.getAllAttributes().iterator();
     Iterator<String> expectedAttrNameIt = expectedAttrNames.iterator();