Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

review: test: Fixed 3 non-deterministic flaky tests #6123

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

review: test: Fixed 3 non-deterministic flaky tests #6123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e0c44a
test: Fixed 2 nondeterministic flaky tests by sorting collections to …
nikunjagarwal321 Dec 29, 2024
9a8524f
test: Fixed 1 nondeterministic flaky test in PositionTest by sorting …
nikunjagarwal321 Dec 29, 2024
137b2c0
Merge branch 'master' into fix-flaky-test
nikunjagarwal321 Jan 10, 2025
784f63f
Merge branch 'master' into fix-flaky-test
nikunjagarwal321 Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/test/java/spoon/test/imports/ImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1878,7 +1879,7 @@ void staticImports_ofNestedTypes_shouldBeRecorded(CtModel model) {
// assert
List<CtImport> imports = mainType.getPosition().getCompilationUnit().getImports();
assertThat(imports, hasSize(2));

imports.sort(Comparator.comparing(importElement -> importElement.getReference().getSimpleName()));
CtImport import0 = imports.get(0);
assertThat(import0.getReference().getSimpleName(), is("InnerClass"));
}
Expand All @@ -1894,7 +1895,7 @@ void staticTypeAndMethodImport_importShouldAppearOnlyOnceIfTheirSimpleNamesAreEq
// assert
List<CtImport> imports = mainType.getPosition().getCompilationUnit().getImports();
assertThat(imports, hasSize(2));

imports.sort(Comparator.comparing(importElement -> importElement.getReference().getSimpleName()));
CtImport import0 = imports.get(0);
assertThat(import0.getImportKind(), is(CtImportKind.METHOD));
assertThat(import0.getReference().getSimpleName(), is("foo"));
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/spoon/test/position/PositionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.io.File;
import java.io.IOException;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;

Expand Down Expand Up @@ -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();
{
Expand Down