Skip to content

Commit

Permalink
[MNG-7098] Keep the project counter intact when resuming a multi-modu…
Browse files Browse the repository at this point in the history 
…le project.
  • Loading branch information
@MartinKanters
MartinKanters committed Sep 16, 2022
1 parent 47e2d68 commit 4a06f1f
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 13 deletions.
6 changes: 5 additions & 1 deletion maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ public void sessionStarted( ExecutionEvent event )
project.getName(), chars( ' ', ( len > 0 ) ? len : 1 ), project.getPackaging() );
}

totalProjects = projects.size();
final List<MavenProject> allProjects = event.getSession().getAllProjects();
final int projectsSkipped = allProjects.size() - projects.size();

currentVisitedProjectCount = projectsSkipped;
totalProjects = allProjects.size();
}
}

Expand Down
103 changes: 91 additions & 12 deletions maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,35 @@
* under the License.
*/

import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.ArgumentMatchers.matches;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.when;

import java.io.File;

import com.google.common.collect.ImmutableList;
import org.apache.commons.io.FilenameUtils;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
import org.mockito.Mockito;
import org.slf4j.Logger;

class ExecutionEventLoggerTest
{

private Logger logger;
private ExecutionEventLogger executionEventLogger;

@BeforeAll
public static void setUp()
{
Expand All @@ -51,14 +60,17 @@ public static void tearDown()
MessageUtils.setColorEnabled( true );
}

@BeforeEach
void beforeEach() {
logger = mock( Logger.class );
when( logger.isInfoEnabled() ).thenReturn( true );
executionEventLogger = new ExecutionEventLogger( logger );
}

@Test
void testProjectStarted()
{
// prepare
Logger logger = mock( Logger.class );
when( logger.isInfoEnabled() ).thenReturn( true );
ExecutionEventLogger executionEventLogger = new ExecutionEventLogger( logger );

File basedir = new File( "" ).getAbsoluteFile();
ExecutionEvent event = mock( ExecutionEvent.class );
MavenProject project = mock( MavenProject.class );
Expand Down Expand Up @@ -92,10 +104,6 @@ void testProjectStarted()
void testProjectStartedOverflow()
{
// prepare
Logger logger = mock( Logger.class );
when( logger.isInfoEnabled() ).thenReturn( true );
ExecutionEventLogger executionEventLogger = new ExecutionEventLogger( logger );

File basedir = new File( "" ).getAbsoluteFile();
ExecutionEvent event = mock( ExecutionEvent.class );
MavenProject project = mock( MavenProject.class );
Expand Down Expand Up @@ -161,13 +169,10 @@ void testTerminalWidth()
Mockito.verify( logger ).info( "-----------------------------------------------------[ maven-plugin ]-----------------------------------------------------" );
}

@Test
public void testProjectStartedNoPom()
{
// prepare
Logger logger = mock( Logger.class );
when( logger.isInfoEnabled() ).thenReturn( true );
ExecutionEventLogger executionEventLogger = new ExecutionEventLogger( logger );

File basedir = new File( "" ).getAbsoluteFile();
ExecutionEvent event = mock( ExecutionEvent.class );
MavenProject project = mock( MavenProject.class );
Expand All @@ -191,6 +196,80 @@ public void testProjectStartedNoPom()
inOrder.verify( logger ).info( "--------------------------------[ pom ]---------------------------------" );
}

@Test
void testMultiModuleProjectProgress()
{
// prepare
MavenProject project1 = generateMavenProject("Apache Maven Embedder 1");
MavenProject project2 = generateMavenProject("Apache Maven Embedder 2");
MavenProject project3 = generateMavenProject("Apache Maven Embedder 3");

MavenSession session = mock( MavenSession.class );
when( session.getProjects() ).thenReturn( ImmutableList.of( project1, project2, project3 ) );
when( session.getAllProjects() ).thenReturn( ImmutableList.of( project1, project2, project3 ) );

ExecutionEvent sessionStartedEvent = mock( ExecutionEvent.class );
when( sessionStartedEvent.getSession() ).thenReturn( session );
ExecutionEvent projectStartedEvent1 = mock( ExecutionEvent.class );
when( projectStartedEvent1.getProject() ).thenReturn( project1 );
ExecutionEvent projectStartedEvent2 = mock( ExecutionEvent.class );
when( projectStartedEvent2.getProject() ).thenReturn( project2 );
ExecutionEvent projectStartedEvent3 = mock( ExecutionEvent.class );
when( projectStartedEvent3.getProject() ).thenReturn( project3 );

// execute
executionEventLogger.sessionStarted( sessionStartedEvent );
executionEventLogger.projectStarted( projectStartedEvent1 );
executionEventLogger.projectStarted( projectStartedEvent2 );
executionEventLogger.projectStarted( projectStartedEvent3 );

// verify
InOrder inOrder = inOrder( logger );
inOrder.verify( logger ).info( matches(".*Apache Maven Embedder 1.*\\[1\\/3\\]") );
inOrder.verify( logger ).info( matches(".*Apache Maven Embedder 2.*\\[2\\/3\\]") );
inOrder.verify( logger ).info( matches(".*Apache Maven Embedder 3.*\\[3\\/3\\]") );
}

@Test
void testMultiModuleProjectResumeFromProgress()
{
// prepare
MavenProject project1 = generateMavenProject("Apache Maven Embedder 1");
MavenProject project2 = generateMavenProject("Apache Maven Embedder 2");
MavenProject project3 = generateMavenProject("Apache Maven Embedder 3");

MavenSession session = mock( MavenSession.class );
when( session.getProjects() ).thenReturn( ImmutableList.of( project2, project3 ) );
when( session.getAllProjects() ).thenReturn( ImmutableList.of( project1, project2, project3 ) );

ExecutionEvent sessionStartedEvent = mock( ExecutionEvent.class );
when( sessionStartedEvent.getSession() ).thenReturn( session );
ExecutionEvent projectStartedEvent2 = mock( ExecutionEvent.class );
when( projectStartedEvent2.getProject() ).thenReturn( project2 );
ExecutionEvent projectStartedEvent3 = mock( ExecutionEvent.class );
when( projectStartedEvent3.getProject() ).thenReturn( project3 );

// execute
executionEventLogger.sessionStarted( sessionStartedEvent );
executionEventLogger.projectStarted( projectStartedEvent2 );
executionEventLogger.projectStarted( projectStartedEvent3 );

// verify
InOrder inOrder = inOrder( logger );
inOrder.verify( logger, never() ).info( matches(".*Apache Maven Embedder 1.*\\[1\\/3\\]") );
inOrder.verify( logger ).info( matches(".*Apache Maven Embedder 2.*\\[2\\/3\\]") );
inOrder.verify( logger ).info( matches(".*Apache Maven Embedder 3.*\\[3\\/3\\]") );
}

private static MavenProject generateMavenProject( String projectName )
{
MavenProject project = mock( MavenProject.class );
when( project.getPackaging() ).thenReturn( "jar" );
when( project.getVersion() ).thenReturn( "3.5.4-SNAPSHOT" );
when( project.getName() ).thenReturn( projectName );
return project;
}

private static String adaptDirSeparator( String path )
{
return FilenameUtils.separatorsToSystem( path );
Expand Down

0 comments on commit 4a06f1f

Please sign in to comment.