Skip to content

Commit 8859f2a

Browse files
fedejeanneiloveeclipse
authored andcommitted
Invert the parameters in calls to assertEquals in JavaLeakTest
"expected" and "actual" were being used wrong.
1 parent a02e8f4 commit 8859f2a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ public void testTextEditorClose() throws Exception {
9595
public void testTextEditorCloseOneOfTwo() throws Exception {
9696
IFile file1= createTestFile("Test1");
9797
IEditorPart editor1= EditorUtility.openInEditor(file1);
98-
assertEquals(editor1.getClass(), TextEditor.class);
98+
assertEquals(TextEditor.class, editor1.getClass());
9999
assertInstanceCount(TextEditor.class, 1);
100100

101101
IFile file2= createTestFile("Test2");
102102
IEditorPart editor2= EditorUtility.openInEditor(file2);
103-
assertEquals(editor2.getClass(), TextEditor.class);
103+
assertEquals(TextEditor.class, editor2.getClass());
104104
assertInstanceCount(TextEditor.class, 2);
105105

106106
assertTrue("Could not close editor", JavaPlugin.getActivePage().closeEditor(editor2, false));
@@ -130,12 +130,12 @@ public void testPropertiesEditorClose() throws Exception {
130130
public void testPropertiesEditorCloseOneOfTwo() throws Exception {
131131
IFile file1= createTestFile("Test1.properties");
132132
IEditorPart editor1= EditorUtility.openInEditor(file1);
133-
assertEquals(editor1.getClass(), PropertiesFileEditor.class);
133+
assertEquals(PropertiesFileEditor.class, editor1.getClass());
134134
assertInstanceCount(PropertiesFileEditor.class, 1);
135135

136136
IFile file2= createTestFile("Test2.properties");
137137
IEditorPart editor2= EditorUtility.openInEditor(file2);
138-
assertEquals(editor2.getClass(), PropertiesFileEditor.class);
138+
assertEquals(PropertiesFileEditor.class, editor2.getClass());
139139
assertInstanceCount(PropertiesFileEditor.class, 2);
140140

141141
assertTrue("Could not close editor", JavaPlugin.getActivePage().closeEditor(editor2, false));
@@ -165,12 +165,12 @@ public void testJavaEditorClose() throws Exception {
165165
public void testJavaEditorCloseOneOfTwo() throws Exception {
166166
ICompilationUnit cu1= createTestCU("Test1");
167167
IEditorPart editor1= EditorUtility.openInEditor(cu1);
168-
assertEquals(editor1.getClass(), CompilationUnitEditor.class);
168+
assertEquals(CompilationUnitEditor.class, editor1.getClass());
169169
assertInstanceCount(CompilationUnitEditor.class, 1);
170170

171171
ICompilationUnit cu2= createTestCU("Test2");
172172
IEditorPart editor2= EditorUtility.openInEditor(cu2);
173-
assertEquals(editor2.getClass(), CompilationUnitEditor.class);
173+
assertEquals(CompilationUnitEditor.class, editor2.getClass());
174174
assertInstanceCount(CompilationUnitEditor.class, 2);
175175

176176
assertTrue("Could not close editor", JavaPlugin.getActivePage().closeEditor(editor2, false));
@@ -218,13 +218,13 @@ public void testJavaEditorBreadcrumbCloseOneOfTwo1() throws Exception {
218218
JavaPlugin.getDefault().getPreferenceStore().setValue(getBreadcrumbPreferenceKey(), true);
219219
ICompilationUnit cu1= createTestCU("Test1");
220220
IEditorPart editor1= EditorUtility.openInEditor(cu1);
221-
assertEquals(editor1.getClass(), CompilationUnitEditor.class);
221+
assertEquals(CompilationUnitEditor.class, editor1.getClass());
222222
activateBreadcrumb((JavaEditor) editor1);
223223
assertInstanceCount(CompilationUnitEditor.class, 1);
224224

225225
ICompilationUnit cu2= createTestCU("Test2");
226226
IEditorPart editor2= EditorUtility.openInEditor(cu2);
227-
assertEquals(editor2.getClass(), CompilationUnitEditor.class);
227+
assertEquals(CompilationUnitEditor.class, editor2.getClass());
228228
activateBreadcrumb((JavaEditor) editor2);
229229
assertInstanceCount(CompilationUnitEditor.class, 2);
230230

@@ -248,12 +248,12 @@ public void testJavaEditorBreadcrumbCloseOneOfTwo2() throws Exception {
248248
JavaPlugin.getDefault().getPreferenceStore().setValue(getBreadcrumbPreferenceKey(), true);
249249
ICompilationUnit cu1= createTestCU("Test1");
250250
IEditorPart editor1= EditorUtility.openInEditor(cu1);
251-
assertEquals(editor1.getClass(), CompilationUnitEditor.class);
251+
assertEquals(CompilationUnitEditor.class, editor1.getClass());
252252
assertInstanceCount(CompilationUnitEditor.class, 1);
253253

254254
ICompilationUnit cu2= createTestCU("Test2");
255255
IEditorPart editor2= EditorUtility.openInEditor(cu2);
256-
assertEquals(editor2.getClass(), CompilationUnitEditor.class);
256+
assertEquals(CompilationUnitEditor.class, editor2.getClass());
257257
activateBreadcrumb((JavaEditor) editor2);
258258
assertInstanceCount(CompilationUnitEditor.class, 2);
259259

@@ -381,7 +381,7 @@ private IEditorPart internalTestEditorOpen(Object objectToOpen, final Class<?> c
381381
IEditorPart part= EditorUtility.openInEditor(objectToOpen);
382382

383383
// make sure the received instance has the type we're expecting
384-
assertEquals(part.getClass(), clazz);
384+
assertEquals(clazz, part.getClass());
385385

386386
// verify that the editor instance is there
387387
assertInstanceCount(clazz, 1);

0 commit comments

Comments
 (0)