You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2021/01/16 14:39:45 UTC
[maven-surefire] 03/03: tests should not fail on concurrent access
of src/test/java/.../*.ConsoleLoggerMock.java
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 8f9745e6d544ba6221e1a3f994483e4372b99075
Author: tibordigana <ti...@gmail.com>
AuthorDate: Sat Jan 16 12:05:25 2021 +0100
tests should not fail on concurrent access of src/test/java/.../*.ConsoleLoggerMock.java
---
.../booterclient/output/ForkClientTest.java | 28 +++++++++++-----------
.../extensions/ForkedProcessEventNotifierTest.java | 28 +++++++++++-----------
.../booter/spi/CommandChannelDecoderTest.java | 28 +++++++++++-----------
3 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
index 531bafb..a0b29cd 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
@@ -1910,9 +1910,9 @@ public class ForkClientTest
final boolean isInfo;
final boolean isWarning;
final boolean isError;
- boolean called;
- boolean isDebugEnabledCalled;
- boolean isInfoEnabledCalled;
+ private volatile boolean called;
+ private volatile boolean isDebugEnabledCalled;
+ private volatile boolean isInfoEnabledCalled;
ConsoleLoggerMock( boolean isDebug, boolean isInfo, boolean isWarning, boolean isError )
{
@@ -1923,7 +1923,7 @@ public class ForkClientTest
}
@Override
- public boolean isDebugEnabled()
+ public synchronized boolean isDebugEnabled()
{
isDebugEnabledCalled = true;
called = true;
@@ -1931,14 +1931,14 @@ public class ForkClientTest
}
@Override
- public void debug( String message )
+ public synchronized void debug( String message )
{
debug.add( message );
called = true;
}
@Override
- public boolean isInfoEnabled()
+ public synchronized boolean isInfoEnabled()
{
isInfoEnabledCalled = true;
called = true;
@@ -1946,52 +1946,52 @@ public class ForkClientTest
}
@Override
- public void info( String message )
+ public synchronized void info( String message )
{
info.add( message );
called = true;
}
@Override
- public boolean isWarnEnabled()
+ public synchronized boolean isWarnEnabled()
{
called = true;
return isWarning;
}
@Override
- public void warning( String message )
+ public synchronized void warning( String message )
{
called = true;
}
@Override
- public boolean isErrorEnabled()
+ public synchronized boolean isErrorEnabled()
{
called = true;
return isError;
}
@Override
- public void error( String message )
+ public synchronized void error( String message )
{
error.add( message );
called = true;
}
@Override
- public void error( String message, Throwable t )
+ public synchronized void error( String message, Throwable t )
{
called = true;
}
@Override
- public void error( Throwable t )
+ public synchronized void error( Throwable t )
{
called = true;
}
- boolean isCalled()
+ synchronized boolean isCalled()
{
return called;
}
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ForkedProcessEventNotifierTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ForkedProcessEventNotifierTest.java
index 558c021..abbdeb0 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ForkedProcessEventNotifierTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ForkedProcessEventNotifierTest.java
@@ -1214,9 +1214,9 @@ public class ForkedProcessEventNotifierTest
final boolean isInfo;
final boolean isWarning;
final boolean isError;
- boolean called;
- boolean isDebugEnabledCalled;
- boolean isInfoEnabledCalled;
+ private volatile boolean called;
+ private volatile boolean isDebugEnabledCalled;
+ private volatile boolean isInfoEnabledCalled;
ConsoleLoggerMock( boolean isDebug, boolean isInfo, boolean isWarning, boolean isError )
{
@@ -1227,7 +1227,7 @@ public class ForkedProcessEventNotifierTest
}
@Override
- public boolean isDebugEnabled()
+ public synchronized boolean isDebugEnabled()
{
isDebugEnabledCalled = true;
called = true;
@@ -1235,14 +1235,14 @@ public class ForkedProcessEventNotifierTest
}
@Override
- public void debug( String message )
+ public synchronized void debug( String message )
{
debug.add( message );
called = true;
}
@Override
- public boolean isInfoEnabled()
+ public synchronized boolean isInfoEnabled()
{
isInfoEnabledCalled = true;
called = true;
@@ -1250,52 +1250,52 @@ public class ForkedProcessEventNotifierTest
}
@Override
- public void info( String message )
+ public synchronized void info( String message )
{
info.add( message );
called = true;
}
@Override
- public boolean isWarnEnabled()
+ public synchronized boolean isWarnEnabled()
{
called = true;
return isWarning;
}
@Override
- public void warning( String message )
+ public synchronized void warning( String message )
{
called = true;
}
@Override
- public boolean isErrorEnabled()
+ public synchronized boolean isErrorEnabled()
{
called = true;
return isError;
}
@Override
- public void error( String message )
+ public synchronized void error( String message )
{
error.add( message );
called = true;
}
@Override
- public void error( String message, Throwable t )
+ public synchronized void error( String message, Throwable t )
{
called = true;
}
@Override
- public void error( Throwable t )
+ public synchronized void error( Throwable t )
{
called = true;
}
- boolean isCalled()
+ synchronized boolean isCalled()
{
return called;
}
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/CommandChannelDecoderTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/CommandChannelDecoderTest.java
index f31d9d8..8ac1829 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/CommandChannelDecoderTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/CommandChannelDecoderTest.java
@@ -430,9 +430,9 @@ public class CommandChannelDecoderTest
final boolean isInfo;
final boolean isWarning;
final boolean isError;
- boolean called;
- boolean isDebugEnabledCalled;
- boolean isInfoEnabledCalled;
+ private volatile boolean called;
+ private volatile boolean isDebugEnabledCalled;
+ private volatile boolean isInfoEnabledCalled;
ConsoleLoggerMock( boolean isDebug, boolean isInfo, boolean isWarning, boolean isError )
{
@@ -443,7 +443,7 @@ public class CommandChannelDecoderTest
}
@Override
- public boolean isDebugEnabled()
+ public synchronized boolean isDebugEnabled()
{
isDebugEnabledCalled = true;
called = true;
@@ -451,14 +451,14 @@ public class CommandChannelDecoderTest
}
@Override
- public void debug( String message )
+ public synchronized void debug( String message )
{
debug.add( message );
called = true;
}
@Override
- public boolean isInfoEnabled()
+ public synchronized boolean isInfoEnabled()
{
isInfoEnabledCalled = true;
called = true;
@@ -466,52 +466,52 @@ public class CommandChannelDecoderTest
}
@Override
- public void info( String message )
+ public synchronized void info( String message )
{
info.add( message );
called = true;
}
@Override
- public boolean isWarnEnabled()
+ public synchronized boolean isWarnEnabled()
{
called = true;
return isWarning;
}
@Override
- public void warning( String message )
+ public synchronized void warning( String message )
{
called = true;
}
@Override
- public boolean isErrorEnabled()
+ public synchronized boolean isErrorEnabled()
{
called = true;
return isError;
}
@Override
- public void error( String message )
+ public synchronized void error( String message )
{
error.add( message );
called = true;
}
@Override
- public void error( String message, Throwable t )
+ public synchronized void error( String message, Throwable t )
{
called = true;
}
@Override
- public void error( Throwable t )
+ public synchronized void error( Throwable t )
{
called = true;
}
- boolean isCalled()
+ synchronized boolean isCalled()
{
return called;
}