Skip to content

Commit 17cfb52

Browse files
waterlooyhwaterlooyh
authored
update the comparator to check positive and negtive numbers and 0 (#8)
* update the comparator to check positive and negtive numbers and 0 * remove unused import
1 parent 0972a52 commit 17cfb52

File tree

3 files changed

+28
-63
lines changed

3 files changed

+28
-63
lines changed

‎surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,6 @@ public Integer testOrderComparator( String className1, String className2, String
547547

548548
String test1 = classFileName1 + "#" + methodName1;
549549
String test2 = classFileName2 + "#" + methodName2;
550-
if ( patternMapper.get( test1 ) < patternMapper.get( test2 ) )
551-
{
552-
return -1;
553-
}
554-
else
555-
{
556-
return 1;
557-
}
550+
return patternMapper.get( test1 ) - patternMapper.get( test2 );
558551
}
559552
}

‎surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultRunOrderCalculator.java‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
import org.apache.maven.surefire.api.testset.RunOrderParameters;
2424
import org.apache.maven.surefire.api.testset.TestListResolver;
2525

26-
import java.io.File;
27-
import java.io.IOException;
28-
import java.nio.charset.Charset;
29-
import java.nio.file.Files;
3026
import java.util.ArrayList;
3127
import java.util.Arrays;
3228
import java.util.Calendar;
@@ -123,7 +119,7 @@ public int compare( String o1, String o2 )
123119

124120
public TestListResolver getTestListResolver()
125121
{
126-
String orderParam = parseTestOrder( System.getProperty( "test" ) );
122+
String orderParam = System.getProperty( "test" );
127123
if ( orderParam == null )
128124
{
129125
throw new IllegalStateException( "TestListResolver in RunOrderCalculator should be used only when "
@@ -193,33 +189,6 @@ else if ( sortOrder != null )
193189
}
194190
}
195191

196-
private String parseTestOrder( String s )
197-
{
198-
// if s is a file, then parse each line of the file as a test
199-
if ( s != null && s != "" )
200-
{
201-
File f = new File( s );
202-
if ( f.exists() && !f.isDirectory ( ) )
203-
{
204-
try
205-
{
206-
List<String> l = Files.readAllLines( f.toPath(), Charset.defaultCharset( ) );
207-
StringBuilder sb = new StringBuilder( );
208-
for ( String sd : l )
209-
{
210-
sb.append( sd + "," );
211-
}
212-
String sd = sb.toString( );
213-
return sd.substring( 0 , sd.length( ) - 1 );
214-
}
215-
catch ( IOException e )
216-
{
217-
}
218-
}
219-
}
220-
return s;
221-
}
222-
223192
private Comparator<Class> getSortOrderComparator( RunOrder runOrder )
224193
{
225194
if ( RunOrder.ALPHABETICAL.equals( runOrder ) )

‎surefire-api/src/test/java/org/apache/maven/surefire/api/testset/TestListResolverTest.java‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -515,15 +515,16 @@ public void testOrderComparatorTest()
515515
TestListResolver tlr = new TestListResolver( orderParamList );
516516
String className = "TestClass1";
517517
String className2 = "TestClass2";
518-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testa1b" ), -1 );
519-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testabc" ), -1 );
520-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa1b", "testabc" ), 1 );
521-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testaBc" ), 1 );
522-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa3d", "testa1b" ), -1 );
523-
assertEquals( ( int ) tlr.testOrderComparator( className, className2, "testa2d", "testa1b" ), -1 );
524-
assertEquals( ( int ) tlr.testOrderComparator( className2, className, "testaBc", "testa1b" ), 1 );
525-
assertEquals( ( int ) tlr.testOrderComparator( className, className2, "testa3d", "testa1b" ), -1 );
526-
assertEquals( ( int ) tlr.testOrderComparator( className, className2, "testa2d", "testabc" ), 1 );
518+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testa1b" ) < 0 );
519+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testabc" ) < 0 );
520+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa1b", "testabc" ) > 0 );
521+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testaBc" ) > 0 );
522+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa3d", "testa1b" ) < 0 );
523+
assertTrue( ( int ) tlr.testOrderComparator( className, className2, "testa2d", "testa1b" ) < 0 );
524+
assertTrue( ( int ) tlr.testOrderComparator( className2, className, "testaBc", "testa1b" ) > 0 );
525+
assertTrue( ( int ) tlr.testOrderComparator( className, className2, "testa3d", "testa1b" ) < 0 );
526+
assertTrue( ( int ) tlr.testOrderComparator( className, className2, "testa2d", "testabc" ) > 0 );
527+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa2d", "testa2d" ) == 0 );
527528
}
528529

529530
public void testRegexMethodOrderComparator()
@@ -537,16 +538,17 @@ public void testRegexMethodOrderComparator()
537538
TestListResolver tlr = new TestListResolver( orderParamList );
538539
String className = "TestClass1";
539540
String className2 = "TestClass2";
540-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testabc", "testa1b" ), -1 );
541-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testaBc", "testa2b" ), -1 );
542-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa1b", "testa3c" ), 1 );
543-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa1b", "testa4b" ), 1 );
544-
assertEquals( ( int ) tlr.testOrderComparator( className, className, "testa4b", "testabc" ), -1 );
545-
assertEquals( ( int ) tlr.testOrderComparator( className, className2, "testa1b", "test1123" ), -1 );
546-
assertEquals( ( int ) tlr.testOrderComparator( className2, className, "testa1b", "testa1b" ), 1 );
547-
assertEquals( ( int ) tlr.testOrderComparator( className2, className2, "testa1b", "test1123" ), 1 );
548-
assertEquals( ( int ) tlr.testOrderComparator( className2, className2, "test1123", "test11MyTest" ), 1 );
549-
assertEquals( ( int ) tlr.testOrderComparator( className2, className2, "test11MyTest", "test456" ), -1 );
541+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testabc", "testa1b" ) < 0 );
542+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testaBc", "testa2b" ) < 0 );
543+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa1b", "testa3c" ) > 0 );
544+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa1b", "testa4b" ) > 0 );
545+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa4b", "testabc" ) < 0 );
546+
assertTrue( ( int ) tlr.testOrderComparator( className, className2, "testa1b", "test1123" ) < 0 );
547+
assertTrue( ( int ) tlr.testOrderComparator( className2, className, "testa1b", "testa1b" ) > 0 );
548+
assertTrue( ( int ) tlr.testOrderComparator( className2, className2, "testa1b", "test1123" ) == 0 );
549+
assertTrue( ( int ) tlr.testOrderComparator( className2, className2, "test1123", "test11MyTest" ) > 0 );
550+
assertTrue( ( int ) tlr.testOrderComparator( className2, className2, "test11MyTest", "test456" ) < 0 );
551+
assertTrue( ( int ) tlr.testOrderComparator( className, className, "testa1c", "testa1c" ) == 0 );
550552
}
551553

552554
public void testRegexClassOrderComparator()
@@ -559,9 +561,10 @@ public void testRegexClassOrderComparator()
559561
String className = "My2ConnectTest";
560562
String className2 = "456My1ConnectTest";
561563
String className3 = "abcMy1PeaceTest";
562-
assertEquals( ( int ) tlr.testOrderComparator( className, className2, null, null ), -1 );
563-
assertEquals( ( int ) tlr.testOrderComparator( className2, className, null, null ), 1 );
564-
assertEquals( ( int ) tlr.testOrderComparator( className3, className2, null, null ), -1 );
565-
assertEquals( ( int ) tlr.testOrderComparator( className, className3, null, null ), 1 );
564+
assertTrue( ( int ) tlr.testOrderComparator( className, className2, null, null ) < 0 );
565+
assertTrue( ( int ) tlr.testOrderComparator( className2, className, null, null ) > 0 );
566+
assertTrue( ( int ) tlr.testOrderComparator( className3, className2, null, null ) < 0 );
567+
assertTrue( ( int ) tlr.testOrderComparator( className, className3, null, null ) > 0 );
568+
assertTrue( ( int ) tlr.testOrderComparator( className, className, null, null ) == 0 );
566569
}
567570
}

0 commit comments

Comments
 (0)