Skip to content

Commit 449fc7c

Browse files
akurtakovakurtakov
committed
Use lambda methods of DisplayHelper
Get rid of all the anonymous classes generated.
1 parent abab1d9 commit 449fc7c

File tree

11 files changed

+894
-1025
lines changed

11 files changed

+894
-1025
lines changed

‎org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestAngular.java‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,18 @@ void testAngularTs() throws Exception {
8484
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), appComponentFile);
8585
DisplayHelper.sleep(4000); // Give time for LS to initialize enough before making edit and sending a
8686
// didChange
87-
assertTrue(new DisplayHelper() {
88-
@Override
89-
protected boolean condition() {
90-
try {
91-
return Arrays
92-
.stream(appComponentFile.findMarkers("org.eclipse.lsp4e.diagnostic", true,
93-
IResource.DEPTH_ZERO))
94-
.anyMatch(marker -> marker.getAttribute(IMarker.LINE_NUMBER, -1) == 5
95-
&& marker.getAttribute(IMarker.MESSAGE, "").contains("not exist"));
96-
} catch (CoreException e) {
97-
e.printStackTrace();
98-
return false;
99-
}
87+
assertTrue(DisplayHelper.waitForCondition(editor.getSite().getShell().getDisplay(), 30000, () -> {
88+
try {
89+
return Arrays
90+
.stream(appComponentFile.findMarkers("org.eclipse.lsp4e.diagnostic", true,
91+
IResource.DEPTH_ZERO))
92+
.anyMatch(marker -> marker.getAttribute(IMarker.LINE_NUMBER, -1) == 5
93+
&& marker.getAttribute(IMarker.MESSAGE, "").contains("not exist"));
94+
} catch (CoreException e) {
95+
e.printStackTrace();
96+
return false;
10097
}
101-
}.waitForCondition(editor.getSite().getShell().getDisplay(), 30000),
102-
"Diagnostic not published in standalone component file");
98+
}), "Diagnostic not published in standalone component file");
10399
editor.close(false);
104100
}
105101

@@ -118,21 +114,17 @@ void testAngularHtml() throws Exception {
118114
// then make an edit
119115
IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
120116
document.set(document.get() + "\n");
121-
assertTrue(new DisplayHelper() {
122-
@Override
123-
protected boolean condition() {
124-
IMarker[] markers;
125-
try {
126-
markers = appComponentHTML.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO);
127-
return Arrays.stream(markers)
128-
.anyMatch(marker -> marker.getAttribute(IMarker.MESSAGE, "").contains("not exist"));
129-
} catch (CoreException e) {
130-
e.printStackTrace();
131-
return false;
132-
}
117+
assertTrue(DisplayHelper.waitForCondition(editor.getSite().getShell().getDisplay(), 30000, () -> {
118+
IMarker[] markers;
119+
try {
120+
markers = appComponentHTML.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO);
121+
return Arrays.stream(markers)
122+
.anyMatch(marker -> marker.getAttribute(IMarker.MESSAGE, "").contains("not exist"));
123+
} catch (CoreException e) {
124+
e.printStackTrace();
125+
return false;
133126
}
134-
}.waitForCondition(editor.getSite().getShell().getDisplay(), 30000),
135-
"No error found on erroneous HTML component file");
127+
}), "No error found on erroneous HTML component file");
136128
// test completion
137129
LSContentAssistProcessor contentAssistProcessor = new LSContentAssistProcessor();
138130
ICompletionProposal[] proposals = contentAssistProcessor.computeCompletionProposals(Utils.getViewer(editor),

‎org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestDebug.java‎

Lines changed: 209 additions & 231 deletions
Large diffs are not rendered by default.

‎org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestESLint.java‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -132,30 +132,24 @@ void testESLintDiagnosticsInTSX() throws Exception {
132132

133133
private void assertESLintIndentMarkerExists(IFile file) throws PartInitException {
134134
IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
135-
assertTrue(new DisplayHelper() {
136-
@Override
137-
protected boolean condition() {
138-
try {
139-
return file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO).length != 0;
140-
} catch (CoreException e) {
141-
e.printStackTrace();
142-
return false;
143-
}
135+
assertTrue(DisplayHelper.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 10000, () -> {
136+
try {
137+
return file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO).length != 0;
138+
} catch (CoreException e) {
139+
e.printStackTrace();
140+
return false;
144141
}
145-
}.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 10000), "Diagnostic not published");
146-
147-
assertTrue(new DisplayHelper() {
148-
@Override
149-
protected boolean condition() {
150-
try {
151-
return Arrays.asList(file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO))
152-
.stream().filter(Objects::nonNull)
153-
.anyMatch(m -> m.getAttribute(IMarker.MESSAGE, null).toLowerCase().contains("indentation"));
154-
} catch (CoreException e) {
155-
e.printStackTrace();
156-
return false;
157-
}
142+
}), "Diagnostic not published");
143+
144+
assertTrue(DisplayHelper.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000, () -> {
145+
try {
146+
return Arrays.asList(file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO))
147+
.stream().filter(Objects::nonNull)
148+
.anyMatch(m -> m.getAttribute(IMarker.MESSAGE, null).toLowerCase().contains("indentation"));
149+
} catch (CoreException e) {
150+
e.printStackTrace();
151+
return false;
158152
}
159-
}.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000), "Diagnostic content is incorrect");
153+
}), "Diagnostic content is incorrect");
160154
}
161155
}

‎org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestHTML.java‎

Lines changed: 68 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -35,96 +35,81 @@
3535
@ExtendWith(AllCleanRule.class)
3636
public class TestHTML {
3737

38-
@Test
39-
public void testHTMLFile() throws Exception {
40-
final IProject project = ResourcesPlugin.getWorkspace().getRoot()
41-
.getProject("testHTMLFile" + System.currentTimeMillis());
42-
project.create(null);
43-
project.open(null);
44-
final IFile file = project.getFile("blah.html");
45-
file.create(new ByteArrayInputStream("FAIL".getBytes()), true, null);
46-
ITextEditor editor = (ITextEditor) IDE
47-
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
48-
editor.getDocumentProvider().getDocument(editor.getEditorInput()).set("<style\n<html><");
49-
assertTrue(new DisplayHelper() {
50-
@Override
51-
protected boolean condition() {
52-
try {
53-
return file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO).length != 0;
54-
} catch (CoreException e) {
55-
return false;
56-
}
57-
}
58-
}.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000), "Diagnostic not published");
59-
}
38+
@Test
39+
public void testHTMLFile() throws Exception {
40+
final IProject project = ResourcesPlugin.getWorkspace().getRoot()
41+
.getProject("testHTMLFile" + System.currentTimeMillis());
42+
project.create(null);
43+
project.open(null);
44+
final IFile file = project.getFile("blah.html");
45+
file.create(new ByteArrayInputStream("FAIL".getBytes()), true, null);
46+
ITextEditor editor = (ITextEditor) IDE
47+
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
48+
editor.getDocumentProvider().getDocument(editor.getEditorInput()).set("<style\n<html><");
49+
assertTrue(DisplayHelper.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000, () -> {
50+
try {
51+
return file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO).length != 0;
52+
} catch (CoreException e) {
53+
return false;
54+
}
55+
}), "Diagnostic not published");
56+
}
6057

61-
@Test
62-
public void testFormat() throws Exception {
63-
final IProject project = ResourcesPlugin.getWorkspace().getRoot()
64-
.getProject("testHTMLFile" + System.currentTimeMillis());
65-
project.create(null);
66-
project.open(null);
67-
final IFile file = project.getFile("blah.html");
68-
file.create(new ByteArrayInputStream("<html><body><a></a></body></html>".getBytes()), true, null);
69-
ITextEditor editor = (ITextEditor) IDE
70-
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
71-
editor.setFocus();
72-
editor.getSelectionProvider().setSelection(new TextSelection(0, 0));
73-
IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class);
58+
@Test
59+
public void testFormat() throws Exception {
60+
final IProject project = ResourcesPlugin.getWorkspace().getRoot()
61+
.getProject("testHTMLFile" + System.currentTimeMillis());
62+
project.create(null);
63+
project.open(null);
64+
final IFile file = project.getFile("blah.html");
65+
file.create(new ByteArrayInputStream("<html><body><a></a></body></html>".getBytes()), true, null);
66+
ITextEditor editor = (ITextEditor) IDE
67+
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
68+
editor.setFocus();
69+
editor.getSelectionProvider().setSelection(new TextSelection(0, 0));
70+
IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class);
7471
// assertTrue(PlatformUI.getWorkbench().getService(ICommandService.class).getCommand("org.eclipse.lsp4e.format")
7572
// .isEnabled());
76-
new DisplayHelper() {
77-
@Override
78-
protected boolean condition() {
79-
try {
80-
return PlatformUI.getWorkbench().getService(ICommandService.class)
81-
.getCommand("org.eclipse.lsp4e.format").isEnabled();
82-
} catch (Exception e) {
83-
return false;
84-
}
85-
}
86-
}.waitForCondition(editor.getSite().getShell().getDisplay(), 3000);
73+
DisplayHelper.waitForCondition(editor.getSite().getShell().getDisplay(), 3000, () -> {
74+
try {
75+
return PlatformUI.getWorkbench().getService(ICommandService.class)
76+
.getCommand("org.eclipse.lsp4e.format").isEnabled();
77+
} catch (Exception e) {
78+
return false;
79+
}
80+
});
8781

8882
// AtomicReference<Exception> ex = new AtomicReference<>();
89-
new DisplayHelper() {
90-
@Override
91-
protected boolean condition() {
92-
try {
93-
handlerService.executeCommand("org.eclipse.lsp4e.format", null);
94-
return true;
95-
} catch (Exception e) {
96-
return false;
97-
}
98-
}
99-
}.waitForCondition(editor.getSite().getShell().getDisplay(), 3000);
83+
DisplayHelper.waitForCondition(editor.getSite().getShell().getDisplay(), 3000, () -> {
84+
try {
85+
handlerService.executeCommand("org.eclipse.lsp4e.format", null);
86+
return true;
87+
} catch (Exception e) {
88+
return false;
89+
}
90+
});
10091
// if (ex.get() != null) {
10192
// throw ex.get();
10293
// }
103-
new DisplayHelper() {
104-
@Override
105-
protected boolean condition() {
106-
return editor.getDocumentProvider().getDocument(editor.getEditorInput()).getNumberOfLines() > 1;
107-
}
108-
}.waitForCondition(editor.getSite().getShell().getDisplay(), 3000);
109-
}
94+
DisplayHelper.waitForCondition(editor.getSite().getShell().getDisplay(), 3000,
95+
() -> editor.getDocumentProvider().getDocument(editor.getEditorInput()).getNumberOfLines() > 1);
96+
}
11097

111-
@Test
112-
public void autoCloseTags() throws Exception {
113-
final IProject project = ResourcesPlugin.getWorkspace().getRoot()
114-
.getProject("testHTMLFile" + System.currentTimeMillis());
115-
project.create(null);
116-
project.open(null);
117-
final IFile file = project.getFile("autoCloseTags.html");
118-
file.create(new ByteArrayInputStream("<foo".getBytes()), true, null);
119-
ITextEditor editor = (ITextEditor) IDE
120-
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
121-
IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
122-
document.replace(4, 0, ">");
123-
assertTrue(new DisplayHelper() {
124-
@Override
125-
protected boolean condition() {
126-
return "<foo></foo>".equals(document.get());
127-
}
128-
}.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000), "Autoclose not done");
129-
}
98+
@Test
99+
public void autoCloseTags() throws Exception {
100+
final IProject project = ResourcesPlugin.getWorkspace().getRoot()
101+
.getProject("testHTMLFile" + System.currentTimeMillis());
102+
project.create(null);
103+
project.open(null);
104+
final IFile file = project.getFile("autoCloseTags.html");
105+
file.create(new ByteArrayInputStream("<foo".getBytes()), true, null);
106+
ITextEditor editor = (ITextEditor) IDE
107+
.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
108+
IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
109+
document.replace(4, 0, ">");
110+
assertTrue(
111+
DisplayHelper.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000,
112+
() -> "<foo></foo>".equals(document.get())),
113+
"Autoclose not done");
114+
}
130115
}

‎org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestJSON.java‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,24 @@
3434
@ExtendWith(AllCleanRule.class)
3535
public class TestJSON {
3636

37-
@Test
38-
public void testFormatEnabled() throws IOException, PartInitException, CoreException {
39-
File file = File.createTempFile("test", ".json");
40-
IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
41-
IEditorPart editor = IDE.openEditorOnFileStore(activePage, EFS.getStore(file.toURI()));
42-
ICommandService service = activePage.getWorkbenchWindow().getService(ICommandService.class);
43-
Command formatCommand = service.getCommand("org.eclipse.lsp4e.format");
44-
assertNotNull(formatCommand, "Format command not found");
45-
assertTrue(formatCommand.isDefined(), "Format command not defined");
37+
@Test
38+
public void testFormatEnabled() throws IOException, PartInitException, CoreException {
39+
File file = File.createTempFile("test", ".json");
40+
IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
41+
IEditorPart editor = IDE.openEditorOnFileStore(activePage, EFS.getStore(file.toURI()));
42+
ICommandService service = activePage.getWorkbenchWindow().getService(ICommandService.class);
43+
Command formatCommand = service.getCommand("org.eclipse.lsp4e.format");
44+
assertNotNull(formatCommand, "Format command not found");
45+
assertTrue(formatCommand.isDefined(), "Format command not defined");
4646
// assertTrue(formatCommand.isEnabled(), "Format command not enabled");
47-
new DisplayHelper() {
48-
@Override
49-
protected boolean condition() {
50-
try {
51-
return formatCommand.isEnabled();
52-
} catch (Exception e) {
53-
return false;
54-
}
55-
}
56-
}.waitForCondition(editor.getSite().getShell().getDisplay(), 3000);
57-
assertTrue(formatCommand.isHandled(), "Format command not handled");
58-
}
47+
DisplayHelper.waitForCondition(editor.getSite().getShell().getDisplay(), 3000, () -> {
48+
try {
49+
return formatCommand.isEnabled();
50+
} catch (Exception e) {
51+
return false;
52+
}
53+
});
54+
assertTrue(formatCommand.isHandled(), "Format command not handled");
55+
}
5956

6057
}

0 commit comments

Comments
 (0)