github-repos/testable-mock
1
0
Fork 0
mirror of https://github.com/alibaba/testable-mock.git synced 2025-02-05 09:10:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: verifier should compare arrays in deep

Browse Source
This commit is contained in:
金戟 2023-05-17 18:04:14 +08:00
parent 320ee632b7
commit 30570ae69d
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testable-core/src/main/java/com/alibaba/testable/core/matcher/InvocationVerifier.java
View File

@ -6,6 +6,7 @@ import com.alibaba.testable.core.util.MockContextUtil;
import com.alibaba.testable.core.util.TestableUtil; import com.alibaba.testable.core.util.TestableUtil;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@ -145,9 +146,13 @@ public class InvocationVerifier {
} }
private boolean matches(Object expectValue, Object realValue) { private boolean matches(Object expectValue, Object realValue) {
return expectValue instanceof InvocationMatcher ? if (expectValue instanceof InvocationMatcher) {
((InvocationMatcher) expectValue).matchFunction.check(realValue) : return ((InvocationMatcher) expectValue).matchFunction.check(realValue);
expectValue.equals(realValue); } else if (expectValue.getClass().isArray() && realValue.getClass().isArray()) {
return Arrays.deepEquals((Object[])expectValue, (Object[])realValue);
} else {
return expectValue.equals(realValue);
}
} }
private String desc(Object[] args) { private String desc(Object[] args) {

47
testable-core/src/test/java/com/alibaba/testable/core/matcher/InvocationVerifierTest.java Normal file
View File

@ -0,0 +1,47 @@
package com.alibaba.testable.core.matcher;
import com.alibaba.testable.core.tool.OmniConstructor;
import com.alibaba.testable.core.tool.PrivateAccessor;
import org.junit.jupiter.api.Test;
import static com.alibaba.testable.core.tool.CollectionTool.listOf;
import static org.junit.jupiter.api.Assertions.*;
class InvocationVerifierTest {
private InvocationVerifier invocationVerifier = OmniConstructor.newInstance(InvocationVerifier.class);
@Test
void should_matches_object() {
assertTrue((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches", "abc", "abc"));
assertTrue((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches", 1L, 1L));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches", "xyz", "abc"));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches", 1L, "abc"));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches", 1L, 1));
}
@Test
void should_matches_array() {
assertTrue((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
new String[] {"abc", "xyz"}, new String[] {"abc", "xyz"}));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
new String[] {"abc", "xyz"}, new String[] {"xyz", "abc"}));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
new String[] {"abc", "xyz"}, new String[] {"xyz"}));
}
@Test
void should_matches_matcher() {
assertTrue((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
InvocationMatcher.anyArray(), new String[] {"abc", "xyz"}));
assertTrue((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
InvocationMatcher.anyString(), "abc"));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
InvocationMatcher.anyString(), new String[] {"abc", "xyz"}));
assertFalse((Boolean)PrivateAccessor.invoke(invocationVerifier, "matches",
InvocationMatcher.anyArray(), "abc"));
}
}