Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add specific type to Mockito argument matcher any(),and work for array types #4

Merged
merged 1 commit into from
Mar 26, 2024
Merged

add specific type to Mockito argument matcher any(),and work for array types #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions src/main/java/com/weirddev/testme/intellij/template/context/MockitoMockBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion testData/testMeGenerator/inheritance/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion testData/testMeGenerator/inheritance/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion testData/testMeGenerator/inheritanceIgnored/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...ta/testMeGenerator/inheritanceIgnored/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions ...stMeGenerator/mockFieldsInDependencyInjection/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...rator/mockFieldsInDependencyInjection/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions ...nerator/mockFieldsInDependencyInjection/testJunit5/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...ator/mockFieldsInDependencyInjection/testPowerMock/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...nerator/mockFieldsInDependencyInjection/testTestNg/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/mockFieldsInDiWithCtor/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...estMeGenerator/mockFieldsInDiWithCtor/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions .../testMeGenerator/mockFieldsInDiWithCtor/testJunit5/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions .../testMeGenerator/mockFieldsInDiWithCtor/testTestNg/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...Data/testMeGenerator/mockFieldsInDiWithSetter/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...tMeGenerator/mockFieldsInDiWithSetter/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions ...estMeGenerator/mockFieldsInDiWithSetter/testJunit5/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...estMeGenerator/mockFieldsInDiWithSetter/testTestNg/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/mockReturned/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/mockReturned/testJunit5/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/mockReturned/testTestNg/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...erator/renderInternalMethodCallStubs/testPowerMock/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...renderInternalMethodCallStubsIgnored/testPowerMock/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions testData/testMeGenerator/variousFieldTypes/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
12 changes: 6 additions & 6 deletions ...ata/testMeGenerator/variousFieldTypes/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
12 changes: 6 additions & 6 deletions ...ta/testMeGenerator/variousFieldTypes/testPowerMock/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/verifyMethodCall/test/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...Data/testMeGenerator/verifyMethodCall/testGroovy/com/example/services/impl/FooTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/verifyMethodCall/testJunit5/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions testData/testMeGenerator/verifyMethodCall/testTestNg/com/example/services/impl/FooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down