Skip to content

Commit

Permalink
Use proper symbol 's' for seconds
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-o
michael-o committed May 24, 2023
1 parent c49b2b7 commit 3ff4afd
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
86 changes: 43 additions & 43 deletions surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ public void unknownThreadCountClassesAndMethods() {

@Test
public void serial() {
// takes 7.2 sec
// takes 7.2 s
unpack().setTestToRun("Suite*Test").executeTest().verifyErrorFree(24);
}

@Test
public void unlimitedThreadsSuites1() {
// takes 3.6 sec
// takes 3.6 s
unpack().parallelSuites()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -151,7 +151,7 @@ public void unlimitedThreadsSuites1() {

@Test
public void unlimitedThreadsSuites2() {
// takes 3.6 sec
// takes 3.6 s
unpack().parallelSuites()
.useUnlimitedThreads()
.threadCountSuites(5)
Expand All @@ -162,7 +162,7 @@ public void unlimitedThreadsSuites2() {

@Test
public void unlimitedThreadsClasses1() {
// takes 1.8 sec
// takes 1.8 s
unpack().parallelClasses()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -172,7 +172,7 @@ public void unlimitedThreadsClasses1() {

@Test
public void unlimitedThreadsClasses2() {
// takes 1.8 sec
// takes 1.8 s
unpack().parallelClasses()
.useUnlimitedThreads()
.threadCountClasses(5)
Expand All @@ -183,7 +183,7 @@ public void unlimitedThreadsClasses2() {

@Test
public void unlimitedThreadsMethods1() {
// takes 2.4 sec
// takes 2.4 s
unpack().parallelMethods()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -193,7 +193,7 @@ public void unlimitedThreadsMethods1() {

@Test
public void unlimitedThreadsMethods2() {
// takes 2.4 sec
// takes 2.4 s
unpack().parallelMethods()
.useUnlimitedThreads()
.threadCountMethods(5)
Expand All @@ -204,7 +204,7 @@ public void unlimitedThreadsMethods2() {

@Test
public void unlimitedThreadsSuitesAndClasses1() {
// takes 0.9 sec
// takes 0.9 s
unpack().parallelSuitesAndClasses()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -214,8 +214,8 @@ public void unlimitedThreadsSuitesAndClasses1() {

@Test
public void unlimitedThreadsSuitesAndClasses2() {
// takes 0.9 sec
// 1.8 sec with 4 parallel classes
// takes 0.9 s
// 1.8 s with 4 parallel classes
unpack().parallelSuitesAndClasses()
.useUnlimitedThreads()
.threadCountSuites(5)
Expand All @@ -227,7 +227,7 @@ public void unlimitedThreadsSuitesAndClasses2() {

@Test
public void unlimitedThreadsSuitesAndMethods1() {
// takes 1.2 sec
// takes 1.2 s
unpack().parallelSuitesAndMethods()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -237,7 +237,7 @@ public void unlimitedThreadsSuitesAndMethods1() {

@Test
public void unlimitedThreadsSuitesAndMethods2() {
// takes 1.2 sec
// takes 1.2 s
unpack().parallelSuitesAndMethods()
.useUnlimitedThreads()
.threadCountSuites(5)
Expand All @@ -249,7 +249,7 @@ public void unlimitedThreadsSuitesAndMethods2() {

@Test
public void unlimitedThreadsClassesAndMethods1() {
// takes 0.6 sec
// takes 0.6 s
unpack().parallelClassesAndMethods()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -259,7 +259,7 @@ public void unlimitedThreadsClassesAndMethods1() {

@Test
public void unlimitedThreadsClassesAndMethods2() {
// takes 0.6 sec
// takes 0.6 s
unpack().parallelClassesAndMethods()
.useUnlimitedThreads()
.threadCountClasses(5)
Expand All @@ -271,7 +271,7 @@ public void unlimitedThreadsClassesAndMethods2() {

@Test
public void unlimitedThreadsAll1() {
// takes 0.3 sec
// takes 0.3 s
unpack().parallelAll()
.useUnlimitedThreads()
.setTestToRun("Suite*Test")
Expand All @@ -281,7 +281,7 @@ public void unlimitedThreadsAll1() {

@Test
public void unlimitedThreadsAll2() {
// takes 0.3 sec
// takes 0.3 s
unpack().parallelAll()
.useUnlimitedThreads()
.threadCountSuites(5)
Expand All @@ -294,7 +294,7 @@ public void unlimitedThreadsAll2() {

@Test
public void threadCountSuites() {
// takes 3.6 sec
// takes 3.6 s
unpack().parallelSuites()
.threadCount(3)
.setTestToRun("Suite*Test")
Expand All @@ -304,8 +304,8 @@ public void threadCountSuites() {

@Test
public void threadCountClasses() {
// takes 3.6 sec for single core
// takes 1.8 sec for double core
// takes 3.6 s for single core
// takes 1.8 s for double core
unpack().parallelClasses()
.threadCount(3)
.setTestToRun("Suite*Test")
Expand All @@ -315,7 +315,7 @@ public void threadCountClasses() {

@Test
public void threadCountMethods() {
// takes 2.4 sec
// takes 2.4 s
unpack().parallelMethods()
.threadCount(3)
.setTestToRun("Suite*Test")
Expand All @@ -325,7 +325,7 @@ public void threadCountMethods() {

@Test
public void threadCountClassesAndMethodsOneCore() {
// takes 4.8 sec
// takes 4.8 s
unpack().disablePerCoreThreadCount()
.disableParallelOptimization()
.parallelClassesAndMethods()
Expand All @@ -348,7 +348,7 @@ public void threadCountClassesAndMethodsOneCoreOptimized() {

@Test
public void threadCountClassesAndMethods() {
// takes 2.4 sec for double core CPU
// takes 2.4 s for double core CPU
unpack().disableParallelOptimization()
.parallelClassesAndMethods()
.threadCount(3)
Expand All @@ -369,8 +369,8 @@ public void threadCountClassesAndMethodsOptimized() {

@Test
public void threadCountSuitesAndMethods() {
// usually 24 times 0.3 sec = 7.2 sec with one core CPU
// takes 1.8 sec for double core CPU
// usually 24 times 0.3 s = 7.2 s with one core CPU
// takes 1.8 s for double core CPU
unpack().disableParallelOptimization()
.parallelSuitesAndMethods()
.threadCount(3)
Expand Down Expand Up @@ -431,7 +431,7 @@ public void threadCountAllOptimized() {

@Test
public void everyThreadCountSuitesAndClasses() {
// takes 1.8 sec for double core CPU
// takes 1.8 s for double core CPU
unpack().parallelSuitesAndClasses()
.threadCount(3)
.threadCountSuites(34)
Expand All @@ -443,7 +443,7 @@ public void everyThreadCountSuitesAndClasses() {

@Test
public void everyThreadCountSuitesAndMethods() {
// takes 1.8 sec for double core CPU
// takes 1.8 s for double core CPU
unpack().parallelSuitesAndMethods()
.threadCount(3)
.threadCountSuites(34)
Expand All @@ -455,7 +455,7 @@ public void everyThreadCountSuitesAndMethods() {

@Test
public void everyThreadCountClassesAndMethods() {
// takes 1.8 sec for double core CPU
// takes 1.8 s for double core CPU
unpack().parallelClassesAndMethods()
.threadCount(3)
.threadCountClasses(34)
Expand All @@ -467,7 +467,7 @@ public void everyThreadCountClassesAndMethods() {

@Test
public void everyThreadCountAll() {
// takes 2.4 sec for double core CPU
// takes 2.4 s for double core CPU
unpack().parallelAll()
.threadCount(3)
.threadCountSuites(17)
Expand All @@ -481,7 +481,7 @@ public void everyThreadCountAll() {
@Test
public void reusableThreadCountSuitesAndClasses() {
// 4 * cpu to 5 * cpu threads to run test classes
// takes cca 1.8 sec
// takes cca 1.8 s
unpack().disableParallelOptimization()
.parallelSuitesAndClasses()
.disablePerCoreThreadCount()
Expand All @@ -507,7 +507,7 @@ public void reusableThreadCountSuitesAndClassesOptimized() {
@Test
public void reusableThreadCountSuitesAndMethods() {
// 4 * cpu to 5 * cpu threads to run test methods
// takes cca 1.8 sec
// takes cca 1.8 s
unpack().disableParallelOptimization()
.parallelSuitesAndMethods()
.disablePerCoreThreadCount()
Expand All @@ -533,7 +533,7 @@ public void reusableThreadCountSuitesAndMethodsOptimized() {
@Test
public void reusableThreadCountClassesAndMethods() {
// 4 * cpu to 5 * cpu threads to run test methods
// takes cca 1.8 sec
// takes cca 1.8 s
unpack().disableParallelOptimization()
.parallelClassesAndMethods()
.disablePerCoreThreadCount()
Expand All @@ -559,7 +559,7 @@ public void reusableThreadCountClassesAndMethodsOptimized() {
@Test
public void reusableThreadCountAll() {
// 8 * cpu to 13 * cpu threads to run test methods
// takes 0.9 sec
// takes 0.9 s
unpack().disableParallelOptimization()
.parallelAll()
.disablePerCoreThreadCount()
Expand All @@ -586,7 +586,7 @@ public void reusableThreadCountAllOptimized() {

@Test
public void suites() {
// takes 3.6 sec
// takes 3.6 s
unpack().parallelSuites()
.threadCountSuites(5)
.setTestToRun("Suite*Test")
Expand All @@ -596,7 +596,7 @@ public void suites() {

@Test
public void classes() {
// takes 1.8 sec on any CPU because the suites are running in a sequence
// takes 1.8 s on any CPU because the suites are running in a sequence
unpack().parallelClasses()
.threadCountClasses(5)
.setTestToRun("Suite*Test")
Expand All @@ -606,7 +606,7 @@ public void classes() {

@Test
public void methods() {
// takes 2.4 sec on any CPU because every class has only three methods
// takes 2.4 s on any CPU because every class has only three methods
// and the suites and classes are running in a sequence
unpack().parallelMethods()
.threadCountMethods(5)
Expand All @@ -617,7 +617,7 @@ public void methods() {

@Test
public void suitesAndClasses() {
// takes 0.9 sec
// takes 0.9 s
unpack().parallelSuitesAndClasses()
.threadCountSuites(5)
.threadCountClasses(15)
Expand All @@ -628,7 +628,7 @@ public void suitesAndClasses() {

@Test
public void suitesAndMethods() {
// takes 1.2 sec on any CPU
// takes 1.2 s on any CPU
unpack().parallelSuitesAndMethods()
.threadCountSuites(5)
.threadCountMethods(15)
Expand All @@ -639,7 +639,7 @@ public void suitesAndMethods() {

@Test
public void classesAndMethods() {
// takes 0.6 sec on any CPU
// takes 0.6 s on any CPU
unpack().parallelClassesAndMethods()
.threadCountClasses(5)
.threadCountMethods(15)
Expand All @@ -650,7 +650,7 @@ public void classesAndMethods() {

@Test
public void all() {
// takes 0.3 sec on any CPU
// takes 0.3 s on any CPU
unpack().parallelAll()
.threadCountSuites(5)
.threadCountClasses(15)
Expand All @@ -662,7 +662,7 @@ public void all() {

@Test
public void shutdown() {
// executes for 2.5 sec until timeout has elapsed
// executes for 2.5 s until timeout has elapsed
unpack().parallelMethods()
.threadCountMethods(2)
.parallelTestsTimeoutInSeconds(2.5d)
Expand All @@ -674,7 +674,7 @@ public void shutdown() {

@Test
public void forcedShutdown() {
// executes for 2.5 sec until timeout has elapsed
// executes for 2.5 s until timeout has elapsed
unpack().parallelMethods()
.threadCountMethods(2)
.parallelTestsTimeoutForcedInSeconds(2.5d)
Expand All @@ -686,7 +686,7 @@ public void forcedShutdown() {

@Test
public void timeoutAndForcedShutdown() {
// executes for one sec until timeout has elapsed
// executes for one s until timeout has elapsed
unpack().parallelMethods()
.threadCountMethods(2)
.parallelTestsTimeoutInSeconds(1)
Expand All @@ -699,7 +699,7 @@ public void timeoutAndForcedShutdown() {

@Test
public void forcedShutdownVerifyingLogs() throws Exception {
// attempts to run for 2.4 sec until timeout has elapsed
// attempts to run for 2.4 s until timeout has elapsed
OutputValidator validator = unpack().parallelMethods()
.threadCountMethods(3)
.disablePerCoreThreadCount()
Expand Down
4 changes: 2 additions & 2 deletions ...-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
* Example, UnlistedTest is the problem here because it runs with filtered out methods:
*
* Running pkg.UnlistedTest
* Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in pkg.UnlistedTest
* Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in pkg.UnlistedTest
* Running pkg.RunningTest
* Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in pkg.RunningTest
* Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in pkg.RunningTest
*
* Results:
*
Expand Down

0 comments on commit 3ff4afd

Please sign in to comment.