Skip to content

Commit

Permalink
[SUREFIRE-2014] Implement testRunId and RunMode in the EventEncoder a…
Browse files Browse the repository at this point in the history 
…nd EventDecoder
  • Loading branch information
@Tibor17
Tibor17 committed Mar 6, 2022
1 parent 307dee3 commit 79db903
Show file tree
Hide file tree
Showing 43 changed files with 606 additions and 463 deletions.
16 changes: 8 additions & 8 deletions ...common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
View file
Expand Up @@ -125,7 +125,7 @@ private final class TestSetStartingListener
implements ForkedProcessReportEventListener<TestSetReportEntry>
{
@Override
public void handle( RunMode runMode, TestSetReportEntry reportEntry )
public void handle( TestSetReportEntry reportEntry )
{
getTestSetReporter().testSetStarting( reportEntry );
setCurrentStartTime();
Expand All @@ -136,7 +136,7 @@ private final class TestSetCompletedListener
implements ForkedProcessReportEventListener<TestSetReportEntry>
{
@Override
public void handle( RunMode runMode, TestSetReportEntry reportEntry )
public void handle( TestSetReportEntry reportEntry )
{
testsInProgress.clear();
TestSetReportEntry entry = reportEntry( reportEntry.getRunMode(), reportEntry.getTestRunId(),
Expand All @@ -151,7 +151,7 @@ public void handle( RunMode runMode, TestSetReportEntry reportEntry )
private final class TestStartingListener implements ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
public void handle( ReportEntry reportEntry )
{
testsInProgress.offer( reportEntry.getSourceName() );
getTestSetReporter().testStarting( reportEntry );
Expand All @@ -161,7 +161,7 @@ public void handle( RunMode runMode, ReportEntry reportEntry )
private final class TestSucceededListener implements ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
public void handle( ReportEntry reportEntry )
{
testsInProgress.remove( reportEntry.getSourceName() );
getTestSetReporter().testSucceeded( reportEntry );
Expand All @@ -171,7 +171,7 @@ public void handle( RunMode runMode, ReportEntry reportEntry )
private final class TestFailedListener implements ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
public void handle( ReportEntry reportEntry )
{
testsInProgress.remove( reportEntry.getSourceName() );
getTestSetReporter().testFailed( reportEntry );
Expand All @@ -181,7 +181,7 @@ public void handle( RunMode runMode, ReportEntry reportEntry )
private final class TestSkippedListener implements ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
public void handle( ReportEntry reportEntry )
{
testsInProgress.remove( reportEntry.getSourceName() );
getTestSetReporter().testSkipped( reportEntry );
Expand All @@ -191,7 +191,7 @@ public void handle( RunMode runMode, ReportEntry reportEntry )
private final class TestErrorListener implements ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
public void handle( ReportEntry reportEntry )
{
testsInProgress.remove( reportEntry.getSourceName() );
getTestSetReporter().testError( reportEntry );
Expand All @@ -201,7 +201,7 @@ public void handle( RunMode runMode, ReportEntry reportEntry )
private final class TestAssumptionFailureListener implements ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
public void handle( ReportEntry reportEntry )
{
testsInProgress.remove( reportEntry.getSourceName() );
getTestSetReporter().testAssumptionFailure( reportEntry );
Expand Down
3 changes: 1 addition & 2 deletions ...java/org/apache/maven/plugin/surefire/booterclient/output/ForkedProcessEventNotifier.java
View file
Expand Up @@ -225,11 +225,10 @@ else if ( event.isTestCategory() )
{
ForkedProcessReportEventListener listener = reportEventListeners.get( eventType );
AbstractTestControlEvent testControlEvent = (AbstractTestControlEvent) event;
RunMode mode = testControlEvent.getRunMode();
ReportEntry reportEntry = testControlEvent.getReportEntry();
if ( listener != null )
{
listener.handle( mode, reportEntry );
listener.handle( reportEntry );
}
}
else if ( event.isJvmExitError() )
Expand Down
3 changes: 1 addition & 2 deletions ...rg/apache/maven/plugin/surefire/booterclient/output/ForkedProcessReportEventListener.java
View file
Expand Up @@ -20,7 +20,6 @@
*/

import org.apache.maven.surefire.api.report.ReportEntry;
import org.apache.maven.surefire.api.report.RunMode;

/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
Expand All @@ -29,5 +28,5 @@
*/
public interface ForkedProcessReportEventListener<T extends ReportEntry>
{
void handle( RunMode runMode, T reportEntry );
void handle( T reportEntry );
}
27 changes: 12 additions & 15 deletions maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/CommandEncoder.java
View file
Expand Up @@ -38,7 +38,6 @@
import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SHUTDOWN;
import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SKIP_SINCE_NEXT_TEST;
import static org.apache.maven.surefire.api.booter.MasterProcessCommand.TEST_SET_FINISHED;
import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN;

/**
*
Expand All @@ -56,52 +55,50 @@ public CommandEncoder( WritableByteChannel out )
public void sendRunClass( String testClassName ) throws IOException
{
CharsetEncoder encoder = newCharsetEncoder();
int bufferMaxLength =
estimateBufferLength( RUN_CLASS.getOpcodeLength(), NORMAL_RUN, encoder, 0, testClassName );
int bufferMaxLength = estimateBufferLength( RUN_CLASS.getOpcodeLength(), null, encoder, 0, 0, testClassName );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
encode( encoder, result, RUN_CLASS, NORMAL_RUN, testClassName );
encode( encoder, result, RUN_CLASS, testClassName );
write( result, true );
}

public void sendTestSetFinished() throws IOException
{
int bufferMaxLength = estimateBufferLength( TEST_SET_FINISHED.getOpcodeLength(), null, null, 0 );
int bufferMaxLength = estimateBufferLength( TEST_SET_FINISHED.getOpcodeLength(), null, null, 0, 0 );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
encodeHeader( result, TEST_SET_FINISHED, null );
encodeHeader( result, TEST_SET_FINISHED );
write( result, true );
}

public void sendSkipSinceNextTest() throws IOException
{
int bufferMaxLength = estimateBufferLength( SKIP_SINCE_NEXT_TEST.getOpcodeLength(), null, null, 0 );
int bufferMaxLength = estimateBufferLength( SKIP_SINCE_NEXT_TEST.getOpcodeLength(), null, null, 0, 0 );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
encodeHeader( result, SKIP_SINCE_NEXT_TEST, null );
encodeHeader( result, SKIP_SINCE_NEXT_TEST );
write( result, true );
}

public void sendShutdown( String shutdownData ) throws IOException
{
CharsetEncoder encoder = newCharsetEncoder();
int bufferMaxLength =
estimateBufferLength( SHUTDOWN.getOpcodeLength(), null, encoder, 0, shutdownData );
int bufferMaxLength = estimateBufferLength( SHUTDOWN.getOpcodeLength(), null, encoder, 0, 0, shutdownData );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
encode( encoder, result, SHUTDOWN, null, shutdownData );
encode( encoder, result, SHUTDOWN, shutdownData );
write( result, true );
}

public void sendNoop() throws IOException
{
int bufferMaxLength = estimateBufferLength( NOOP.getOpcodeLength(), null, null, 0 );
int bufferMaxLength = estimateBufferLength( NOOP.getOpcodeLength(), null, null, 0, 0 );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
encodeHeader( result, NOOP, null );
encodeHeader( result, NOOP );
write( result, true );
}

public void sendByeAck() throws IOException
{
int bufferMaxLength = estimateBufferLength( BYE_ACK.getOpcodeLength(), null, null, 0 );
int bufferMaxLength = estimateBufferLength( BYE_ACK.getOpcodeLength(), null, null, 0, 0 );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
encodeHeader( result, BYE_ACK, null );
encodeHeader( result, BYE_ACK );
write( result, true );
}

Expand Down

0 comments on commit 79db903

Please sign in to comment.