Merge pull request #4 from zhangfj88/zfj_task

add specific type to Mockito argument matcher any(),and work for array types
huangliang992 · Mar 26, 2024 · f7ab68e · f7ab68e
2 parents dc23b0f + cada609
commit f7ab68e
Show file tree

Hide file tree

Showing 30 changed files with 82 additions and 43 deletions.
diff --git a/src/main/java/com/weirddev/testme/intellij/template/context/MockitoMockBuilder.java b/src/main/java/com/weirddev/testme/intellij/template/context/MockitoMockBuilder.java
@@ -227,31 +227,26 @@ public String buildMockArgsMatchers(List<Param> params,String language) {
      */
     @NotNull
     private String deductMatcherTypeMethod(Param param, Language language) {
-        String matcherType;
-        if (param.getType().isVarargs()) {
-            matcherType = "anyVararg";
+        Type type = param.getType();
+        String matcherMethod = resolveMatcherMethod(type);
+        if (language == Language.Scala) {
+            return matcherMethod;
         }
-        else {
-            matcherType = TYPE_TO_ARG_MATCHERS.get(param.getType().getCanonicalName());
-        }
-        if (matcherType == null) {
-            matcherType = "any";
-        }
-        //todo support anyCollection(),anyMap(),anySet() and consider arrays
-        if (language != Language.Scala) {
-            matcherType += "()";
-        }
-        // add specific type to any()
-        if( matcherType.equals("any()")){
-            matcherType = addSpecificType(param.getType().getName());
+        else if (!type.isPrimitive() &&  "any".equals(matcherMethod)) {
+            return matcherMethod + "("+ type.getCanonicalName()+(type.isArray()? "[]":"") +".class)";
+        } else {
+            return matcherMethod+"()";
         }
-        return matcherType;
     }
 
-    @SuppressWarnings("unused")
-    @Deprecated
-    public boolean shouldStub(Method testMethod, List<Field> testedClassFields) {
-        return callsMockMethod(testMethod, testedClassFields, Method::hasReturn, null);
+    private static String resolveMatcherMethod(Type type) {
+        if (type.isVarargs()) {
+            return "anyVararg";
+        } else if(!type.isArray() && TYPE_TO_ARG_MATCHERS.containsKey(type.getCanonicalName())){
+            return TYPE_TO_ARG_MATCHERS.get(type.getCanonicalName());
+        } else {
+            return "any";
+        }
     }
 
     String addSpecificType(String typeName) {

diff --git a/testData/testMeGenerator/inheritance/test/com/example/services/impl/FooTest.java b/testData/testMeGenerator/inheritance/test/com/example/services/impl/FooTest.java
@@ -25,7 +25,7 @@ public void setUp() {
 
     @Test
     public void testFight() throws Exception {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse");
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
 
         String result = foo.fight(new com.example.foes.Fire(), "foeName");
         Assert.assertEquals("replaceMeWithExpectedResult", result);

diff --git a/testData/testMeGenerator/inheritance/testGroovy/com/example/services/impl/FooTest.groovy b/testData/testMeGenerator/inheritance/testGroovy/com/example/services/impl/FooTest.groovy
@@ -23,7 +23,7 @@ class FooTest {
 
     @Test
     void testFight() {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse")
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
 
         java.lang.String result = foo.fight(new com.example.foes.Fire(), "foeName")
         assert result == "replaceMeWithExpectedResult"

diff --git a/testData/testMeGenerator/inheritanceIgnored/test/com/example/services/impl/FooTest.java b/testData/testMeGenerator/inheritanceIgnored/test/com/example/services/impl/FooTest.java
@@ -25,7 +25,7 @@ public void setUp() {
 
     @Test
     public void testFight() throws Exception {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse");
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
 
         String result = foo.fight(new com.example.foes.Fire(), "foeName");
         Assert.assertEquals("replaceMeWithExpectedResult", result);

diff --git a/...ta/testMeGenerator/inheritanceIgnored/testGroovy/com/example/services/impl/FooTest.groovy b/...ta/testMeGenerator/inheritanceIgnored/testGroovy/com/example/services/impl/FooTest.groovy
@@ -23,7 +23,7 @@ class FooTest {
 
     @Test
     void testFight() {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse")
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
 
         java.lang.String result = foo.fight(new com.example.foes.Fire(), "foeName")
         assert result == "replaceMeWithExpectedResult"

diff --git a/...stMeGenerator/mockFieldsInDependencyInjection/test/com/example/services/impl/FooTest.java b/...stMeGenerator/mockFieldsInDependencyInjection/test/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...rator/mockFieldsInDependencyInjection/testGroovy/com/example/services/impl/FooTest.groovy b/...rator/mockFieldsInDependencyInjection/testGroovy/com/example/services/impl/FooTest.groovy
@@ -1,7 +1,9 @@
 package com.example.services.impl
 
 import com.example.beans.ConvertedBean
+import com.example.foes.Fear
 import com.example.foes.Fire
+import com.example.foes.Ice
 import com.example.warriers.TechFighter
 import org.junit.Test
 import org.junit.Before

diff --git a/...nerator/mockFieldsInDependencyInjection/testJunit5/com/example/services/impl/FooTest.java b/...nerator/mockFieldsInDependencyInjection/testJunit5/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ator/mockFieldsInDependencyInjection/testPowerMock/com/example/services/impl/FooTest.java b/...ator/mockFieldsInDependencyInjection/testPowerMock/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...nerator/mockFieldsInDependencyInjection/testTestNg/com/example/services/impl/FooTest.java b/...nerator/mockFieldsInDependencyInjection/testTestNg/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;

diff --git a/testData/testMeGenerator/mockFieldsInDiWithCtor/test/com/example/services/impl/FooTest.java b/testData/testMeGenerator/mockFieldsInDiWithCtor/test/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...estMeGenerator/mockFieldsInDiWithCtor/testGroovy/com/example/services/impl/FooTest.groovy b/...estMeGenerator/mockFieldsInDiWithCtor/testGroovy/com/example/services/impl/FooTest.groovy
@@ -1,7 +1,9 @@
 package com.example.services.impl
 
 import com.example.beans.ConvertedBean
+import com.example.foes.Fear
 import com.example.foes.Fire
+import com.example.foes.Ice
 import com.example.warriers.TechFighter
 import org.junit.Test
 import org.junit.Before

diff --git a/.../testMeGenerator/mockFieldsInDiWithCtor/testJunit5/com/example/services/impl/FooTest.java b/.../testMeGenerator/mockFieldsInDiWithCtor/testJunit5/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/.../testMeGenerator/mockFieldsInDiWithCtor/testTestNg/com/example/services/impl/FooTest.java b/.../testMeGenerator/mockFieldsInDiWithCtor/testTestNg/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;

diff --git a/...Data/testMeGenerator/mockFieldsInDiWithSetter/test/com/example/services/impl/FooTest.java b/...Data/testMeGenerator/mockFieldsInDiWithSetter/test/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...tMeGenerator/mockFieldsInDiWithSetter/testGroovy/com/example/services/impl/FooTest.groovy b/...tMeGenerator/mockFieldsInDiWithSetter/testGroovy/com/example/services/impl/FooTest.groovy
@@ -1,7 +1,9 @@
 package com.example.services.impl
 
 import com.example.beans.ConvertedBean
+import com.example.foes.Fear
 import com.example.foes.Fire
+import com.example.foes.Ice
 import com.example.warriers.TechFighter
 import org.junit.Test
 import org.junit.Before

diff --git a/...estMeGenerator/mockFieldsInDiWithSetter/testJunit5/com/example/services/impl/FooTest.java b/...estMeGenerator/mockFieldsInDiWithSetter/testJunit5/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...estMeGenerator/mockFieldsInDiWithSetter/testTestNg/com/example/services/impl/FooTest.java b/...estMeGenerator/mockFieldsInDiWithSetter/testTestNg/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;

diff --git a/testData/testMeGenerator/mockReturned/test/com/example/services/impl/FooTest.java b/testData/testMeGenerator/mockReturned/test/com/example/services/impl/FooTest.java
@@ -2,7 +2,9 @@
 
 import com.example.beans.ConvertedBean;
 import com.example.dependencies.Logger;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.FooFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/testData/testMeGenerator/mockReturned/testJunit5/com/example/services/impl/FooTest.java b/testData/testMeGenerator/mockReturned/testJunit5/com/example/services/impl/FooTest.java
@@ -2,7 +2,9 @@
 
 import com.example.beans.ConvertedBean;
 import com.example.dependencies.Logger;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.FooFighter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/testData/testMeGenerator/mockReturned/testTestNg/com/example/services/impl/FooTest.java b/testData/testMeGenerator/mockReturned/testTestNg/com/example/services/impl/FooTest.java
@@ -2,7 +2,9 @@
 
 import com.example.beans.ConvertedBean;
 import com.example.dependencies.Logger;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.FooFighter;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;

diff --git a/...erator/renderInternalMethodCallStubs/testPowerMock/com/example/services/impl/FooTest.java b/...erator/renderInternalMethodCallStubs/testPowerMock/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...renderInternalMethodCallStubsIgnored/testPowerMock/com/example/services/impl/FooTest.java b/...renderInternalMethodCallStubsIgnored/testPowerMock/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/testData/testMeGenerator/variousFieldTypes/test/com/example/services/impl/FooTest.java b/testData/testMeGenerator/variousFieldTypes/test/com/example/services/impl/FooTest.java
@@ -45,12 +45,12 @@ public void setUp() {
 
     @Test
     public void testFight() throws Exception {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterProtected.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterDefault.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterPublic.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterFinal.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterStatic.fight(any(Fire.class))).thenReturn("fightResponse");
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterProtected.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterDefault.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterPublic.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterFinal.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterStatic.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
         when(innerOfPublicInnerClass.methodOfInnerClass()).thenReturn(new Foo().new PublicInnerClass().new InnerOfPublicInnerClass());
 
         String result = foo.fight(new com.example.foes.Fire(), "foeName");

diff --git a/...ata/testMeGenerator/variousFieldTypes/testGroovy/com/example/services/impl/FooTest.groovy b/...ata/testMeGenerator/variousFieldTypes/testGroovy/com/example/services/impl/FooTest.groovy
@@ -41,12 +41,12 @@ class FooTest {
 
     @Test
     void testFight() {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse")
-        when(fooFighterProtected.fight(any(Fire.class))).thenReturn("fightResponse")
-        when(fooFighterDefault.fight(any(Fire.class))).thenReturn("fightResponse")
-        when(fooFighterPublic.fight(any(Fire.class))).thenReturn("fightResponse")
-        when(fooFighterFinal.fight(any(Fire.class))).thenReturn("fightResponse")
-        when(fooFighterStatic.fight(any(Fire.class))).thenReturn("fightResponse")
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
+        when(fooFighterProtected.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
+        when(fooFighterDefault.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
+        when(fooFighterPublic.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
+        when(fooFighterFinal.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
+        when(fooFighterStatic.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse")
         when(innerOfPublicInnerClass.methodOfInnerClass()).thenReturn(new com.example.services.impl.Foo.PublicInnerClass.InnerOfPublicInnerClass(new com.example.services.impl.Foo.PublicInnerClass(new com.example.services.impl.Foo())))
 
         java.lang.String result = foo.fight(new com.example.foes.Fire(), "foeName")

diff --git a/...ta/testMeGenerator/variousFieldTypes/testPowerMock/com/example/services/impl/FooTest.java b/...ta/testMeGenerator/variousFieldTypes/testPowerMock/com/example/services/impl/FooTest.java
@@ -57,12 +57,12 @@ public void setUp() {
 
     @Test
     public void testFight() throws Exception {
-        when(fooFighter.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterProtected.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterDefault.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterPublic.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterFinal.fight(any(Fire.class))).thenReturn("fightResponse");
-        when(fooFighterStatic.fight(any(Fire.class))).thenReturn("fightResponse");
+        when(fooFighter.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterProtected.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterDefault.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterPublic.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterFinal.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
+        when(fooFighterStatic.fight(any(com.example.foes.Fire.class))).thenReturn("fightResponse");
         when(innerOfPublicInnerClass.methodOfInnerClass()).thenReturn(new Foo().new PublicInnerClass().new InnerOfPublicInnerClass());
         String result = foo.fight(new com.example.foes.Fire(), "foeName");
         verify(publicInnerClass).methodOfInnerClass();

diff --git a/testData/testMeGenerator/verifyMethodCall/test/com/example/services/impl/FooTest.java b/testData/testMeGenerator/verifyMethodCall/test/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...Data/testMeGenerator/verifyMethodCall/testGroovy/com/example/services/impl/FooTest.groovy b/...Data/testMeGenerator/verifyMethodCall/testGroovy/com/example/services/impl/FooTest.groovy
@@ -1,7 +1,9 @@
 package com.example.services.impl
 
 import com.example.beans.ConvertedBean
+import com.example.foes.Fear
 import com.example.foes.Fire
+import com.example.foes.Ice
 import com.example.warriers.TechFighter
 import org.junit.Test
 import org.junit.Before

diff --git a/testData/testMeGenerator/verifyMethodCall/testJunit5/com/example/services/impl/FooTest.java b/testData/testMeGenerator/verifyMethodCall/testJunit5/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/testData/testMeGenerator/verifyMethodCall/testTestNg/com/example/services/impl/FooTest.java b/testData/testMeGenerator/verifyMethodCall/testTestNg/com/example/services/impl/FooTest.java
@@ -1,7 +1,9 @@
 package com.example.services.impl;
 
 import com.example.beans.ConvertedBean;
+import com.example.foes.Fear;
 import com.example.foes.Fire;
+import com.example.foes.Ice;
 import com.example.warriers.TechFighter;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;