Skip to content

Mockito improvements #985

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

Closed
slachiewicz wants to merge 2 commits into from
Closed

Mockito improvements #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38acfce
Mockito improvements
slachiewicz Feb 14, 2026
29d5b9c
Downgrade Mockito version from 5.21.0 to 5.11.0
slachiewicz Feb 14, 2026
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
12 changes: 6 additions & 6 deletions maven-archetype-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-testing</artifactId>
<version>2.1.0</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>5.6.0</version>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-testing</artifactId>
<version>2.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
101 changes: 45 additions & 56 deletions ...org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
import org.apache.maven.archetype.metadata.ArchetypeDescriptor;
import org.apache.maven.archetype.metadata.RequiredProperty;
import org.codehaus.plexus.testing.PlexusTest;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.anyString;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.isNull;

/**
* Tests the ability to use variables in default fields in batch mode.
Expand Down Expand Up @@ -76,32 +76,30 @@ public void setUp() throws Exception {
descriptor.addRequiredProperty(groupName);
descriptor.addRequiredProperty(serviceName);

ArchetypeArtifactManager manager = EasyMock.createMock(ArchetypeArtifactManager.class);
ArchetypeArtifactManager manager = Mockito.mock(ArchetypeArtifactManager.class);

File archetype = new File("archetype.jar");

EasyMock.expect(manager.exists(
Mockito.when(manager.exists(
eq("archetypeGroupId"),
eq("archetypeArtifactId"),
eq("archetypeVersion"),
anyObject(),
anyObject()))
.andReturn(true);
EasyMock.expect(manager.getArchetypeFile(
any(),
any()))
.thenReturn(true);
Mockito.when(manager.getArchetypeFile(
eq("archetypeGroupId"),
eq("archetypeArtifactId"),
eq("archetypeVersion"),
anyObject(),
anyObject()))
.andReturn(archetype);
EasyMock.expect(manager.isFileSetArchetype(archetype)).andReturn(true);
EasyMock.expect(manager.isOldArchetype(archetype)).andReturn(false);
EasyMock.expect(manager.getFileSetArchetypeDescriptor(archetype)).andReturn(descriptor);

EasyMock.replay(manager);
any(),
any()))
.thenReturn(archetype);
Mockito.when(manager.isFileSetArchetype(archetype)).thenReturn(true);
Mockito.when(manager.isOldArchetype(archetype)).thenReturn(false);
Mockito.when(manager.getFileSetArchetypeDescriptor(archetype)).thenReturn(descriptor);
configurator.setArchetypeArtifactManager(manager);

queryer = EasyMock.mock(ArchetypeGenerationQueryer.class);
queryer = Mockito.mock(ArchetypeGenerationQueryer.class);
configurator.setArchetypeGenerationQueryer(queryer);
}

Expand Down Expand Up @@ -131,25 +129,22 @@ public void testInteractive() throws Exception {
request.setArchetypeVersion("archetypeVersion");
Properties properties = new Properties();

EasyMock.expect(queryer.getPropertyValue(eq("groupName"), anyString(), isNull()))
.andReturn("myGroupName");
Mockito.when(queryer.getPropertyValue(eq("groupName"), anyString(), isNull()))
.thenReturn("myGroupName");

EasyMock.expect(queryer.getPropertyValue(eq("serviceName"), anyString(), isNull()))
.andReturn("myServiceName");
Mockito.when(queryer.getPropertyValue(eq("serviceName"), anyString(), isNull()))
.thenReturn("myServiceName");

EasyMock.expect(queryer.getPropertyValue(anyString(), anyString(), anyObject()))
.andAnswer(new IAnswer<String>() {
Mockito.when(queryer.getPropertyValue(anyString(), anyString(), any()))
.thenAnswer(new IAnswer<String>() {

@Override
public String answer() throws Throwable {
return (String) EasyMock.getCurrentArguments()[1];
return (String) Mockito.getCurrentArguments()[1];
}
})
.anyTimes();
});

EasyMock.expect(queryer.confirmConfiguration(anyObject())).andReturn(Boolean.TRUE);

EasyMock.replay(queryer);
Mockito.when(queryer.confirmConfiguration(any())).thenReturn(Boolean.TRUE);
configurator.configureArchetype(request, Boolean.TRUE, properties);

assertEquals("com.example.myGroupName", request.getGroupId());
Expand All @@ -171,25 +166,22 @@ public void testArchetype406ComplexCustomPropertyValue() throws Exception {
request.setArchetypeVersion("archetypeVersion");
Properties properties = new Properties();

EasyMock.expect(queryer.getPropertyValue(eq("groupName"), anyString(), isNull()))
.andReturn("myGroupName");
Mockito.when(queryer.getPropertyValue(eq("groupName"), anyString(), isNull()))
.thenReturn("myGroupName");

EasyMock.expect(queryer.getPropertyValue(eq("serviceName"), anyString(), isNull()))
.andReturn("myServiceName");
Mockito.when(queryer.getPropertyValue(eq("serviceName"), anyString(), isNull()))
.thenReturn("myServiceName");

EasyMock.expect(queryer.getPropertyValue(anyString(), anyString(), anyObject()))
.andAnswer(new IAnswer<String>() {
Mockito.when(queryer.getPropertyValue(anyString(), anyString(), any()))
.thenAnswer(new IAnswer<String>() {

@Override
public String answer() throws Throwable {
return (String) EasyMock.getCurrentArguments()[1];
return (String) Mockito.getCurrentArguments()[1];
}
})
.anyTimes();

EasyMock.expect(queryer.confirmConfiguration(anyObject())).andReturn(Boolean.TRUE);
});

EasyMock.replay(queryer);
Mockito.when(queryer.confirmConfiguration(any())).thenReturn(Boolean.TRUE);
configurator.configureArchetype(request, Boolean.TRUE, properties);

assertEquals("MYSERVICENAME", request.getProperties().get("serviceUpper"));
Expand All @@ -211,25 +203,22 @@ public void testArchetype618() throws Exception {
request.setArchetypeVersion("archetypeVersion");
Properties properties = new Properties();

EasyMock.expect(queryer.getPropertyValue(eq("groupName"), anyString(), isNull()))
.andReturn("myGroupName");
Mockito.when(queryer.getPropertyValue(eq("groupName"), anyString(), isNull()))
.thenReturn("myGroupName");

EasyMock.expect(queryer.getPropertyValue(eq("artifactId"), anyString(), isNull()))
.andReturn("my-service-name");
Mockito.when(queryer.getPropertyValue(eq("artifactId"), anyString(), isNull()))
.thenReturn("my-service-name");

EasyMock.expect(queryer.getPropertyValue(anyString(), anyString(), anyObject()))
.andAnswer(new IAnswer<String>() {
Mockito.when(queryer.getPropertyValue(anyString(), anyString(), any()))
.thenAnswer(new IAnswer<String>() {

@Override
public String answer() throws Throwable {
return (String) EasyMock.getCurrentArguments()[1];
return (String) Mockito.getCurrentArguments()[1];
}
})
.anyTimes();

EasyMock.expect(queryer.confirmConfiguration(anyObject())).andReturn(Boolean.TRUE);
});

EasyMock.replay(queryer);
Mockito.when(queryer.confirmConfiguration(any())).thenReturn(Boolean.TRUE);
configurator.configureArchetype(request, Boolean.TRUE, properties);

assertEquals("MyServiceName", request.getProperties().get("camelArtifact"));
Expand Down
32 changes: 15 additions & 17 deletions .../org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfiguratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
import org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.testing.PlexusTest;
import org.easymock.EasyMock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.eq;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;

/**
* TODO probably testing a little deep, could just test ArchetypeConfiguration
Expand All @@ -53,29 +53,27 @@ public class DefaultArchetypeGenerationConfiguratorTest {
@BeforeEach
public void setUp() throws Exception {

ArchetypeArtifactManager manager = EasyMock.createMock(ArchetypeArtifactManager.class);
ArchetypeArtifactManager manager = Mockito.mock(ArchetypeArtifactManager.class);

File archetype = new File("archetype.jar");
EasyMock.expect(manager.exists(
Mockito.when(manager.exists(
eq("archetypeGroupId"),
eq("archetypeArtifactId"),
eq("archetypeVersion"),
anyObject(),
anyObject()))
.andReturn(true);
EasyMock.expect(manager.getArchetypeFile(
any(),
any()))
.thenReturn(true);
Mockito.when(manager.getArchetypeFile(
eq("archetypeGroupId"),
eq("archetypeArtifactId"),
eq("archetypeVersion"),
anyObject(),
anyObject()))
.andReturn(archetype);
EasyMock.expect(manager.isFileSetArchetype(archetype)).andReturn(false);
EasyMock.expect(manager.isOldArchetype(archetype)).andReturn(true);
any(),
any()))
.thenReturn(archetype);
Mockito.when(manager.isFileSetArchetype(archetype)).thenReturn(false);
Mockito.when(manager.isOldArchetype(archetype)).thenReturn(true);

EasyMock.expect(manager.getOldArchetypeDescriptor(archetype)).andReturn(new ArchetypeDescriptor());

EasyMock.replay(manager);
Mockito.when(manager.getOldArchetypeDescriptor(archetype)).thenReturn(new ArchetypeDescriptor());
configurator.setArchetypeArtifactManager(manager);
}

Expand Down
10 changes: 4 additions & 6 deletions .../java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.testing.PlexusTest;
import org.easymock.EasyMock;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand All @@ -38,12 +38,10 @@ public class DefaultArchetypeGenerationQueryerTest {

@Test
public void testPropertyRegexValidationRetry() throws PrompterException {
Prompter prompter = EasyMock.createMock(Prompter.class);
Prompter prompter = Mockito.mock(Prompter.class);

EasyMock.expect(prompter.prompt(EasyMock.anyObject())).andReturn("invalid-answer");
EasyMock.expect(prompter.prompt(EasyMock.anyObject())).andReturn("valid-answer");

EasyMock.replay(prompter);
Mockito.when(prompter.prompt(Mockito.any())).thenReturn("invalid-answer");
Mockito.when(prompter.prompt(Mockito.any())).thenReturn("valid-answer");
queryer.setPrompter(prompter);

String value = queryer.getPropertyValue("custom-property", null, Pattern.compile("^valid-.*"));
Expand Down
Loading
Loading