File tree 3 files changed +12
-2
lines changed
3 files changed +12
-2
lines changed Original file line number Diff line number Diff line change 89
89
import java .util .ArrayList ;
90
90
import java .util .Arrays ;
91
91
import java .util .Collection ;
92
+ import java .util .Comparator ;
92
93
import java .util .HashMap ;
93
94
import java .util .HashSet ;
94
95
import java .util .List ;
@@ -1877,6 +1878,7 @@ void staticImports_ofNestedTypes_shouldBeRecorded(CtModel model) {
1877
1878
1878
1879
// assert
1879
1880
List <CtImport > imports = mainType .getPosition ().getCompilationUnit ().getImports ();
1881
+ imports .sort (Comparator .comparing (importElement -> importElement .getReference ().getSimpleName ()));
1880
1882
assertThat (imports , hasSize (2 ));
1881
1883
1882
1884
CtImport import0 = imports .get (0 );
@@ -1894,6 +1896,7 @@ void staticTypeAndMethodImport_importShouldAppearOnlyOnceIfTheirSimpleNamesAreEq
1894
1896
// assert
1895
1897
List <CtImport > imports = mainType .getPosition ().getCompilationUnit ().getImports ();
1896
1898
assertThat (imports , hasSize (2 ));
1899
+ imports .sort (Comparator .comparing (importElement -> importElement .getImportKind ().toString ()));
1897
1900
1898
1901
CtImport import0 = imports .get (0 );
1899
1902
assertThat (import0 .getImportKind (), is (CtImportKind .METHOD ));
Original file line number Diff line number Diff line change 19
19
20
20
import java .io .File ;
21
21
import java .io .IOException ;
22
+ import java .util .Comparator ;
22
23
import java .util .Iterator ;
23
24
import java .util .List ;
24
25
@@ -806,6 +807,8 @@ public void testPositionOfCtImport() throws Exception {
806
807
AnnonymousClassNewIface .class );
807
808
String originSources = foo .getPosition ().getCompilationUnit ().getOriginalSourceCode ();
808
809
List <CtImport > imports = foo .getPosition ().getCompilationUnit ().getImports ();
810
+ // Sorting using position of import element so that they are sorted in the order they are imported
811
+ imports .sort (Comparator .comparing (importElement -> importElement .getPosition ().getSourceStart ()));
809
812
assertEquals (2 , imports .size ());
810
813
Iterator <CtImport > iter = imports .iterator ();
811
814
{
Original file line number Diff line number Diff line change @@ -176,8 +176,12 @@ public void testCreateTypeFromTemplate() {
176
176
assertNotNull (genEnum );
177
177
assertSame (genEnum , factory .Type ().get ("generated.GenEnum" ));
178
178
assertEquals (2 , genEnum .getEnumValues ().size ());
179
- assertEquals ("GOOD" , genEnum .getEnumValues ().get (0 ).getSimpleName ());
180
- assertEquals ("BETTER" , genEnum .getEnumValues ().get (1 ).getSimpleName ());
179
+ List <String > enumValueNames = genEnum .getEnumValues ().stream ()
180
+ .map (CtEnumValue ::getSimpleName )
181
+ .sorted ()
182
+ .toList ();
183
+ assertEquals ("GOOD" , enumValueNames .get (1 ));
184
+ assertEquals ("BETTER" , enumValueNames .get (0 ));
181
185
}
182
186
183
187
@ Test
You can’t perform that action at this time.
0 commit comments