[SUREFIRE-2025] Updated abstractions which helps associating systemPr…

…operties() with a test
apache · Feb 24, 2022 · adbbc82 · adbbc82
1 parent fdf0228
commit adbbc82
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/...test/java/org/apache/maven/plugin/surefire/extensions/ForkedProcessEventNotifierTest.java b/...test/java/org/apache/maven/plugin/surefire/extensions/ForkedProcessEventNotifierTest.java
@@ -111,7 +111,7 @@ public void shouldHaveSystemProperty() throws Exception
             WritableBufferedByteChannel wChannel = newBufferedChannel( out );
             EventChannelEncoder encoder = new EventChannelEncoder( wChannel );
             Map<String, String> props = ObjectUtils.systemProps();
-            encoder.systemProperties( props );
+            encoder.systemProperties( props, NORMAL_RUN, 1L );
             wChannel.close();
 
             ForkedProcessEventNotifier notifier = new ForkedProcessEventNotifier();
@@ -805,7 +805,7 @@ public void shouldCountSameNumberOfSystemProperties() throws Exception
             final Stream out = Stream.newStream();
             WritableBufferedByteChannel wChannel = newBufferedChannel( out );
             EventChannelEncoder encoder = new EventChannelEncoder( wChannel );
-            encoder.systemProperties( ObjectUtils.systemProps() );
+            encoder.systemProperties( ObjectUtils.systemProps(), NORMAL_RUN, 1L );
             wChannel.close();
 
             ReadableByteChannel channel = newChannel( new ByteArrayInputStream( out.toByteArray() ) );

diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/ForkingRunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/ForkingRunListener.java
@@ -68,7 +68,7 @@ public void testSetStarting( TestSetReportEntry report )
     @Override
     public void testSetCompleted( TestSetReportEntry report )
     {
-        target.systemProperties( report.getSystemProperties() );
+        target.systemProperties( report.getSystemProperties(), null, null );
         target.testSetCompleted( report, trim );
     }
 

diff --git a/...e-api/src/main/java/org/apache/maven/surefire/api/booter/MasterProcessChannelEncoder.java b/...e-api/src/main/java/org/apache/maven/surefire/api/booter/MasterProcessChannelEncoder.java
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.surefire.api.report.ReportEntry;
+import org.apache.maven.surefire.api.report.RunMode;
 import org.apache.maven.surefire.api.report.StackTraceWriter;
 import org.apache.maven.surefire.api.report.TestOutputReportEntry;
 
@@ -37,7 +38,7 @@ public interface MasterProcessChannelEncoder
 
     void onJvmExit();
 
-    void systemProperties( Map<String, String> sysProps );
+    void systemProperties( Map<String, String> sysProps, RunMode runMode, Long testRunId );
 
     void testSetStarting( ReportEntry reportEntry, boolean trimStackTraces );
 

diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/EventChannelEncoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/EventChannelEncoder.java
@@ -128,7 +128,7 @@ public void onJvmExit()
     }
 
     @Override
-    public void systemProperties( Map<String, String> sysProps )
+    public void systemProperties( Map<String, String> sysProps, RunMode rm, Long testRunId )
     {
         CharsetEncoder encoder = newCharsetEncoder();
         ByteBuffer result = null;

diff --git a/...re-booter/src/test/java/org/apache/maven/surefire/booter/spi/EventChannelEncoderTest.java b/...re-booter/src/test/java/org/apache/maven/surefire/booter/spi/EventChannelEncoderTest.java
@@ -1151,7 +1151,7 @@ public void shouldCountSameNumberOfSystemProperties() throws IOException
         EventChannelEncoder encoder = new EventChannelEncoder( channel );
 
         Map<String, String> sysProps = ObjectUtils.systemProps();
-        encoder.systemProperties( sysProps );
+        encoder.systemProperties( sysProps, NORMAL_RUN, 1L );
         channel.close();
 
         for ( Entry<String, String> entry : sysProps.entrySet() )