mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

Fixes for Test Leaking Editor test

Browse source 
The testLeakingInstanceAfterClose test relied on some weird
behaviour of an earlier test (testScalabilityDialogNotDismissedInadvertently_417909)
which had the effect of opening the editor window without the
welcome screen. This change makes that explicit and adds a little
bit of logging to identify why the testLeakingInstanceAfterClose
test may sometimes fail.

I have also increased the maximum time allowed before the test timesout.

Change-Id: I3433ccf1fc02cff76eeb278d05fee082157ca49c
This commit is contained in:
Jonah Graham 2019-05-22 14:10:44 -04:00
parent 83d67dd074
commit f98add0056
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java
View file

@ -65,6 +65,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorRegistry;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@ -122,6 +123,7 @@ public class BasicCEditorTest extends BaseUITestCase {
@Override
protected void setUp() throws Exception {
closeWelcome();
super.setUp();
}
@ -442,6 +444,19 @@ public class BasicCEditorTest extends BaseUITestCase {
assertTrue(part instanceof CEditor);
}
public static void closeWelcome() {
try {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
IWorkbenchPage activePage = window.getActivePage();
IWorkbenchPart activePart = activePage.getActivePart();
if (activePart.getTitle().equals("Welcome")) {
activePart.dispose();
}
} catch (Exception e) {
// ignore
}
}
public void testLeakingInstanceAfterClose() throws Exception {
final String file = "/ceditor/src/main.cpp";
fCProject = EditorTestHelper.createCProject("ceditor", "resources/ceditor", false, false);
@ -452,11 +467,13 @@ public class BasicCEditorTest extends BaseUITestCase {
EditorTestHelper.closeEditor(fEditor);
fEditor = null;
fSourceViewer = null;
int ngc = 10;
while (ref.get() != null && ngc-- > 0) {
int ngc = 0;
while (ref.get() != null && ngc++ < 100) {
System.gc();
EditorTestHelper.runEventQueue(200);
}
System.out
.println("BasicCEditorTest.testLeakingInstanceAfterClose took " + ngc + " iterations of loop to exit");
assertNull("CEditor instance seems to be leaking after close", ref.get());
}