You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2018/02/27 02:54:06 UTC
maven-surefire git commit: trying to avoid flaky test
Repository: maven-surefire
Updated Branches:
refs/heads/master a7a5d4b96 -> 17d2c4100
trying to avoid flaky test
Signed-off-by: olivier lamy <ol...@apache.org>
trying to avoid flaky test
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/17d2c410
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/17d2c410
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/17d2c410
Branch: refs/heads/master
Commit: 17d2c4100055c2ef5033d1e9bdec738e8309f3b9
Parents: a7a5d4b
Author: olivier lamy <ol...@apache.org>
Authored: Tue Feb 27 12:37:31 2018 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Feb 27 12:53:28 2018 +1000
----------------------------------------------------------------------
.../pc/ParallelComputerBuilderTest.java | 36 ++++++++++----------
.../junitcore/pc/ParallelComputerUtilTest.java | 35 ++++++++++---------
2 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/17d2c410/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
index b90da87..a679563 100755
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
@@ -137,9 +137,9 @@ public class ParallelComputerBuilderTest
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -175,9 +175,9 @@ public class ParallelComputerBuilderTest
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class, Class1.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -204,9 +204,9 @@ public class ParallelComputerBuilderTest
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class, Class1.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -239,9 +239,9 @@ public class ParallelComputerBuilderTest
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -266,9 +266,9 @@ public class ParallelComputerBuilderTest
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -296,9 +296,9 @@ public class ParallelComputerBuilderTest
// Each group takes 0.5s.
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class, Class1.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -323,9 +323,9 @@ public class ParallelComputerBuilderTest
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( computer, TestSuite.class, Class1.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
@@ -342,9 +342,9 @@ public class ParallelComputerBuilderTest
@Test( timeout = 2000 )
public void shutdown()
{
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = new ShutdownTest().run( false );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertTrue( result.wasSuccessful() );
assertTrue( beforeShutdown );
@@ -354,9 +354,9 @@ public class ParallelComputerBuilderTest
@Test( timeout = 2000 )
public void shutdownWithInterrupt()
{
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
new ShutdownTest().run( true );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
assertTrue( beforeShutdown );
assertThat( timeSpent, between( 450, 1250 ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/17d2c410/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
index df6ca1c..f6c1139 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
@@ -40,9 +40,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import static org.apache.maven.surefire.junitcore.pc.ParallelComputerUtil.*;
import static org.apache.maven.surefire.junitcore.JUnitCoreParameters.*;
+import static org.apache.maven.surefire.junitcore.pc.RangeMatcher.between;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
@@ -971,9 +973,9 @@ public final class ParallelComputerUtilTest
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final Result result = core.run( pc, TestClass.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
long timeSpent = t2 - t1;
final long deltaTime = 500L;
@@ -981,6 +983,7 @@ public final class ParallelComputerUtilTest
assertThat( result.getRunCount(), is( 3 ) );
assertThat( result.getFailureCount(), is( 0 ) );
assertThat( result.getIgnoreCount(), is( 0 ) );
+ //assertThat( timeSpent, between (timeSpent - deltaTime, timeSpent + deltaTime + 2000L ) );
assertEquals( 10000L, timeSpent, deltaTime );
}
@@ -998,9 +1001,9 @@ public final class ParallelComputerUtilTest
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
core.run( pc, TestClass.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
final long deltaTime = 500L;
@@ -1024,9 +1027,9 @@ public final class ParallelComputerUtilTest
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
core.run( pc, TestClass.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
final long deltaTime = 500L;
@@ -1053,9 +1056,9 @@ public final class ParallelComputerUtilTest
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
core.run( pc, TestClass.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
final long deltaTime = 500L;
@@ -1080,9 +1083,9 @@ public final class ParallelComputerUtilTest
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
final JUnitCore core = new JUnitCore();
- final long t1 = System.currentTimeMillis();
+ final long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
core.run( pc, TestClass.class );
- final long t2 = System.currentTimeMillis();
+ final long t2 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
final long timeSpent = t2 - t1;
final long deltaTime = 500L;
@@ -1099,14 +1102,14 @@ public final class ParallelComputerUtilTest
public void a()
throws InterruptedException
{
- long t1 = System.currentTimeMillis();
+ long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
try
{
Thread.sleep( 5000L );
}
finally
{
- System.out.println( getClass().getSimpleName() + "#a() spent " + ( System.currentTimeMillis() - t1 ) );
+ System.out.println( getClass().getSimpleName() + "#a() spent " + ( TimeUnit.NANOSECONDS.toMillis( System.nanoTime()) - t1 ) );
}
}
@@ -1114,14 +1117,14 @@ public final class ParallelComputerUtilTest
public void b()
throws InterruptedException
{
- long t1 = System.currentTimeMillis();
+ long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
try
{
Thread.sleep( 5000L );
}
finally
{
- System.out.println( getClass().getSimpleName() + "#b() spent " + ( System.currentTimeMillis() - t1 ) );
+ System.out.println( getClass().getSimpleName() + "#b() spent " + ( TimeUnit.NANOSECONDS.toMillis( System.nanoTime()) - t1 ) );
}
}
@@ -1129,14 +1132,14 @@ public final class ParallelComputerUtilTest
public void c()
throws InterruptedException
{
- long t1 = System.currentTimeMillis();
+ long t1 = TimeUnit.NANOSECONDS.toMillis( System.nanoTime());
try
{
Thread.sleep( 5000L );
}
finally
{
- System.out.println( getClass().getSimpleName() + "#c() spent " + ( System.currentTimeMillis() - t1 ) );
+ System.out.println( getClass().getSimpleName() + "#c() spent " + ( TimeUnit.NANOSECONDS.toMillis( System.nanoTime()) - t1 ) );
}
}
}