You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/01/30 13:40:55 UTC
maven-surefire git commit: Correct writing style and symbol naming
Repository: maven-surefire
Updated Branches:
refs/heads/master 82aaf81da -> 969c4ecf2
Correct writing style and symbol naming
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/969c4ecf
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/969c4ecf
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/969c4ecf
Branch: refs/heads/master
Commit: 969c4ecf2577462c1e336a5f3a776444d83c344a
Parents: 82aaf81
Author: Michael Osipov <mi...@apache.org>
Authored: Sat Jan 30 13:38:34 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat Jan 30 13:38:34 2016 +0100
----------------------------------------------------------------------
.../maven/plugin/surefire/booterclient/ForkStarter.java | 2 +-
.../plugin/surefire/report/DefaultReporterFactory.java | 2 +-
.../plugin/surefire/report/WrappedReportEntry.java | 2 +-
.../plugin/surefire/report/WrappedReportEntryTest.java | 2 +-
.../org/apache/maven/surefire/booter/ForkedBooter.java | 2 +-
.../apache/maven/surefire/its/Junit47concurrencyIT.java | 2 +-
.../Surefire747MethodParallelWithSuiteCountIT.java | 12 ++++++------
.../plugins/surefire/selfdestruct/SelfDestructMojo.java | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 11710d9..10eca6a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -661,7 +661,7 @@ public class ForkStarter
private static ScheduledExecutorService createPingScheduler()
{
- ThreadFactory threadFactory = newDaemonThreadFactory( "ping-timer-" + PING_IN_SECONDS + "sec" );
+ ThreadFactory threadFactory = newDaemonThreadFactory( "ping-timer-" + PING_IN_SECONDS + "s" );
return Executors.newScheduledThreadPool( 1, threadFactory );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index dbb78d7..c28bed2 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -132,7 +132,7 @@ public class DefaultReporterFactory
if ( reportConfiguration.isPrintSummary() )
{
logger.info( "" );
- logger.info( "Results :" );
+ logger.info( "Results:" );
logger.info( "" );
}
boolean printedFailures = printTestFailures( logger, TestResultType.failure );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index 3e99306..12f63e5 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -136,7 +136,7 @@ public class WrappedReportEntry
public String getElapsedTimeVerbose()
{
- return "Time elapsed: " + elapsedTimeAsString() + " sec";
+ return "Time elapsed: " + elapsedTimeAsString() + " s";
}
public String getElapsedTimeSummary()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
index 0e34754..030fc2f 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
@@ -65,7 +65,7 @@ public class WrappedReportEntryTest
ReportEntry reportEntry = new SimpleReportEntry( "fud", category );
WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
String elapsedTimeSummary = wr.getElapsedTimeSummary();
- assertEquals( "[0] 1, 2, 3 (testSum)(surefire.testcase.JunitParamsTest) Time elapsed: 0.012 sec",
+ assertEquals( "[0] 1, 2, 3 (testSum)(surefire.testcase.JunitParamsTest) Time elapsed: 0.012 s",
elapsedTimeSummary );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 823353e..b5ff6dd 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -254,7 +254,7 @@ public final class ForkedBooter
{
ThreadFactory threadFactory = newDaemonThreadFactory( "last-ditch-daemon-shutdown-thread-"
+ SYSTEM_EXIT_TIMEOUT_IN_SECONDS
- + "sec" );
+ + "s" );
ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor( 1, threadFactory );
executor.setMaximumPoolSize( 1 );
executor.prestartCoreThread();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
index 0821763..c129c4c 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
@@ -55,6 +55,6 @@ public class Junit47concurrencyIT
}
assertNotNull( result);
assertThat( result, anyOf( containsString( "Time elapsed: 1." ), containsString( "Time elapsed: 0.9" ) ) );
- assertThat( result, endsWith( " sec - in concurrentjunit47.src.test.java.junit47.BasicTest" ) );
+ assertThat( result, endsWith( " s - in concurrentjunit47.src.test.java.junit47.BasicTest" ) );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
index 0e480a9..6166b3e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
@@ -74,14 +74,14 @@ public class Surefire747MethodParallelWithSuiteCountIT
{
long duration = duration( testLine );
long min = 250, max = 750;
- assertTrue( String.format( "duration %d should be between %d and %d millis", duration, min, max ),
+ assertTrue( String.format( "duration %d should be between %d and %d ms", duration, min, max ),
duration > min && duration < max );
}
Set<String> suiteLines = printTestLines( validator, "suite finished after duration=" );
assertThat( suiteLines.size(), is( 1 ) );
long duration = duration( suiteLines.iterator().next() );
long min = 750, max = 1250;
- assertTrue( String.format( "duration %d should be between %d and %d millis", duration, min, max ),
+ assertTrue( String.format( "duration %d should be between %d and %d ms", duration, min, max ),
duration > min && duration < max );
for ( String line : validator.loadLogLines() )
@@ -95,8 +95,8 @@ public class Surefire747MethodParallelWithSuiteCountIT
containsString( "Time elapsed: 0.7" ),
containsString( "Time elapsed: 0.8" ) ) );
assertThat( line, anyOf(
- endsWith(" sec - in surefire747.SuiteTest1" ),
- endsWith(" sec - in surefire747.SuiteTest2" ) ) );
+ endsWith(" s - in surefire747.SuiteTest1" ),
+ endsWith(" s - in surefire747.SuiteTest2" ) ) );
}
}
}
@@ -112,14 +112,14 @@ public class Surefire747MethodParallelWithSuiteCountIT
{
long duration = duration( testLine );
long min = 1250, max = 1750;
- assertTrue( String.format( "duration %d should be between %d and %d millis", duration, min, max ),
+ assertTrue( String.format( "duration %d should be between %d and %d ms", duration, min, max ),
duration > min && duration < max );
}
Set<String> suiteLines = printTestLines( validator, "suite finished after duration=" );
assertThat( suiteLines.size(), is( 1 ) );
long duration = duration( suiteLines.iterator().next() );
long min = 1250, max = 1750;
- assertTrue( String.format( "duration %d should be between %d and %d millis", duration, min, max ),
+ assertTrue( String.format( "duration %d should be between %d and %d ms", duration, min, max ),
duration > min && duration < max );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/969c4ecf/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
index 2e95bf1..d5f791f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
+++ b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
@@ -82,7 +82,7 @@ public class SelfDestructMojo
if ( timeoutInMillis > 0 )
{
- getLog().warn( "Self-Destruct in " + timeoutInMillis + " millis using " + destructMethod );
+ getLog().warn( "Self-Destruct in " + timeoutInMillis + " ms using " + destructMethod );
Timer timer = new Timer( "", true );
timer.schedule( new SelfDestructionTask( destructMethod ), timeoutInMillis );
}