test: Fixed 4 nondeterministic flaky tests by sorting collections to …

…make them deterministic
INRIA · Nov 25, 2024 · 6496e3c · 6496e3c
1 parent 5e519b7
commit 6496e3c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/test/java/spoon/test/imports/ImportTest.java b/src/test/java/spoon/test/imports/ImportTest.java
@@ -89,6 +89,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -1877,6 +1878,7 @@ void staticImports_ofNestedTypes_shouldBeRecorded(CtModel model) {
 
 		// assert
 		List<CtImport> imports = mainType.getPosition().getCompilationUnit().getImports();
+		imports.sort(Comparator.comparing(importElement -> importElement.getReference().getSimpleName()));
 		assertThat(imports, hasSize(2));
 
 		CtImport import0 = imports.get(0);
@@ -1894,6 +1896,7 @@ void staticTypeAndMethodImport_importShouldAppearOnlyOnceIfTheirSimpleNamesAreEq
 		// assert
 		List<CtImport> imports = mainType.getPosition().getCompilationUnit().getImports();
 		assertThat(imports, hasSize(2));
+		imports.sort(Comparator.comparing(importElement -> importElement.getImportKind().toString()));
 
 		CtImport import0 = imports.get(0);
 		assertThat(import0.getImportKind(), is(CtImportKind.METHOD));

diff --git a/src/test/java/spoon/test/position/PositionTest.java b/src/test/java/spoon/test/position/PositionTest.java
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
@@ -806,6 +807,8 @@ public void testPositionOfCtImport() throws Exception {
 			AnnonymousClassNewIface.class);
 		String originSources = foo.getPosition().getCompilationUnit().getOriginalSourceCode();
 		List<CtImport> imports = foo.getPosition().getCompilationUnit().getImports();
+		// Sorting using position of import element so that they are sorted in the order they are imported
+		imports.sort(Comparator.comparing(importElement -> importElement.getPosition().getSourceStart()));
 		assertEquals(2, imports.size());
 		Iterator<CtImport> iter = imports.iterator();
 		{

diff --git a/src/test/java/spoon/test/template/SubstitutionTest.java b/src/test/java/spoon/test/template/SubstitutionTest.java
@@ -176,8 +176,12 @@ public void testCreateTypeFromTemplate() {
         assertNotNull(genEnum);
         assertSame(genEnum, factory.Type().get("generated.GenEnum"));
         assertEquals(2, genEnum.getEnumValues().size());
-        assertEquals("GOOD", genEnum.getEnumValues().get(0).getSimpleName());
-        assertEquals("BETTER", genEnum.getEnumValues().get(1).getSimpleName());
+        List<String> enumValueNames = genEnum.getEnumValues().stream()
+                .map(CtEnumValue::getSimpleName)
+                .sorted()
+                .toList();
+        assertEquals("GOOD", enumValueNames.get(1));
+        assertEquals("BETTER", enumValueNames.get(0));
     }
 
     @Test