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

BasicFileDetectorTest.testInclusions* fail randomly #1270

Merged
merged 1 commit into from
Nov 25, 2019
Merged

BasicFileDetectorTest.testInclusions* fail randomly #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
Expand Down Expand Up @@ -345,7 +346,7 @@ public class Preferences {

private List<String> javaCompletionFavoriteMembers;

private List<String> javaImportExclusions = new ArrayList<>();
private List<String> javaImportExclusions = new LinkedList<>();
private String javaHome;
private List<String> importOrder;
private List<String> filteredTypes;
Expand All @@ -357,7 +358,7 @@ public class Preferences {
private int parallelBuildsCount;

static {
JAVA_IMPORT_EXCLUSIONS_DEFAULT = new ArrayList<>();
JAVA_IMPORT_EXCLUSIONS_DEFAULT = new LinkedList<>();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See redhat-developer/vscode-java#1084 (comment)

The order is important.

JAVA_IMPORT_EXCLUSIONS_DEFAULT.add("**/node_modules/**");
JAVA_IMPORT_EXCLUSIONS_DEFAULT.add("**/.metadata/**");
JAVA_IMPORT_EXCLUSIONS_DEFAULT.add("**/archetype-resources/**");
Expand Down Expand Up @@ -561,8 +562,12 @@ public static Preferences createFrom(Map<String, Object> configuration) {
prefs.setGenerateToStringLimitElements(generateToStringLimitElements);

List<String> javaImportExclusions = getList(configuration, JAVA_IMPORT_EXCLUSIONS_KEY, JAVA_IMPORT_EXCLUSIONS_DEFAULT);
prefs.setJavaImportExclusions(javaImportExclusions);

if (javaImportExclusions instanceof LinkedList) {
prefs.setJavaImportExclusions(javaImportExclusions);
} else {
List<String> copy = new LinkedList<>(javaImportExclusions);
prefs.setJavaImportExclusions(copy);
}
List<String> javaCompletionFavoriteMembers = getList(configuration, JAVA_COMPLETION_FAVORITE_MEMBERS_KEY, JAVA_COMPLETION_FAVORITE_MEMBERS_DEFAULT);
prefs.setJavaCompletionFavoriteMembers(javaCompletionFavoriteMembers);

Expand Down
8 changes: 8 additions & 0 deletions ...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/contentassist/SnippetUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,28 @@
import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
import org.eclipse.lsp4j.MarkupContent;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

public class SnippetUtilsTest {

// @Mock
protected PreferenceManager preferenceManager;
private PreferenceManager oldPreferenceManager;

@Before
public void initProjectManager() throws Exception {
preferenceManager = mock(PreferenceManager.class);
oldPreferenceManager = JavaLanguageServerPlugin.getPreferencesManager();
JavaLanguageServerPlugin.setPreferencesManager(preferenceManager);
}

@After
public void cleanup() throws Exception {
JavaLanguageServerPlugin.setPreferencesManager(oldPreferenceManager);
}

@Test
public void testWhenMarkDownSupported() {
ClientPreferences mockCapabilies = mock(ClientPreferences.class);
Expand Down
4 changes: 0 additions & 4 deletions ...lipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/correction/ReorgQuickFixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
import org.eclipse.jdt.ls.core.internal.ResourceUtils;
import org.eclipse.jdt.ls.core.internal.handlers.CodeActionHandler;
import org.eclipse.lsp4j.CodeAction;
Expand All @@ -51,10 +50,7 @@ public class ReorgQuickFixTest extends AbstractQuickFixTest {
public void setup() throws Exception {
fJProject1 = newEmptyProject();
fJProject1.setOptions(TestOptions.getDefaultOptions());

JavaLanguageServerPlugin.setPreferencesManager(preferenceManager);
when(preferenceManager.getClientPreferences().isResourceOperationSupported()).thenReturn(true);

fSourceFolder = fJProject1.getPackageFragmentRoot(fJProject1.getProject().getFolder("src"));
}

Expand Down
4 changes: 4 additions & 0 deletions ...tests/src/org/eclipse/jdt/ls/core/internal/managers/AbstractProjectsManagerBasedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ public abstract class AbstractProjectsManagerBasedTest {
@Mock
protected PreferenceManager preferenceManager;

private PreferenceManager oldPreferenceManager;

protected Preferences preferences;

protected SimpleLogListener logListener;
Expand Down Expand Up @@ -130,6 +132,7 @@ public void initProjectManager() throws Exception {
}
initPreferenceManager(true);

oldPreferenceManager = JavaLanguageServerPlugin.getPreferencesManager();
JavaLanguageServerPlugin.setPreferencesManager(preferenceManager);
projectsManager = new ProjectsManager(preferenceManager);
ProgressReporterManager progressManager = new ProgressReporterManager(this.client, preferenceManager);
Expand Down Expand Up @@ -242,6 +245,7 @@ protected File getWorkingProjectDirectory() throws IOException {

@After
public void cleanUp() throws Exception {
JavaLanguageServerPlugin.setPreferencesManager(oldPreferenceManager);
projectsManager = null;
Platform.removeLogListener(logListener);
logListener = null;
Expand Down
6 changes: 3 additions & 3 deletions ...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/BasicFileDetectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void testInclusions() throws Exception {
JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaImportExclusions(javaImportInclusions);
BasicFileDetector detector = new BasicFileDetector(Paths.get("projects/buildfiles/parent"), "buildfile").includeNested(false).maxDepth(3);
Collection<Path> dirs = detector.scan(null);
assertEquals("Found " + dirs, 2, dirs.size());
assertEquals("Found " + dirs + " ,exclusions=" + JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaImportExclusions(), 2, dirs.size());
List<String> missingDirs = separatorsToSystem(list("projects/buildfiles/parent/1_0/0_2_0", "projects/buildfiles/parent/1_0/0_2_1"));
dirs.stream().map(Path::toString).forEach(missingDirs::remove);
assertEquals("Directories were not detected" + missingDirs, 0, missingDirs.size());
Expand All @@ -113,7 +113,7 @@ public void testInclusions2() throws Exception {
JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaImportExclusions(javaImportInclusions);
BasicFileDetector detector = new BasicFileDetector(Paths.get("projects/buildfiles/parent"), "buildfile").includeNested(false).maxDepth(3);
Collection<Path> dirs = detector.scan(null);
assertEquals("Found " + dirs, 1, dirs.size());
assertEquals("Found " + " ,exclusions=" + JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaImportExclusions() + dirs, 1, dirs.size());
List<String> missingDirs = separatorsToSystem(list("projects/buildfiles/parent/1_0/0_2_0"));
dirs.stream().map(Path::toString).forEach(missingDirs::remove);
assertEquals("Directories were not detected" + missingDirs, 0, missingDirs.size());
Expand All @@ -135,7 +135,7 @@ public void testInclusions3() throws Exception {
JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaImportExclusions(javaImportInclusions);
BasicFileDetector detector = new BasicFileDetector(Paths.get("projects/buildfiles/parent"), "buildfile").includeNested(false).maxDepth(3);
Collection<Path> dirs = detector.scan(null);
assertEquals("Found " + dirs, 0, dirs.size());
assertEquals("Found " + " ,exclusions=" + JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaImportExclusions() + dirs, 0, dirs.size());
} finally {
JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaImportExclusions(javaImportExclusions);
}
Expand Down