|
13 | 13 |
|
14 | 14 | import static org.junit.Assert.assertEquals; |
15 | 15 | import static org.junit.Assert.assertNotEquals; |
| 16 | +import static org.junit.Assert.assertTrue; |
16 | 17 | import static org.junit.Assert.fail; |
17 | 18 |
|
18 | 19 | import java.io.File; |
19 | 20 | import java.io.IOException; |
| 21 | +import java.util.Arrays; |
20 | 22 | import java.util.List; |
21 | 23 | import java.util.Set; |
22 | 24 | import java.util.function.Supplier; |
@@ -91,6 +93,7 @@ public ImportConfirmation get() { |
91 | 93 |
|
92 | 94 | private static final String PROP_LAST_MODIFIED_PROPERTY = "last modified"; |
93 | 95 | private static final String TEXT_EDITOR_ID = "org.eclipse.ui.DefaultTextEditor"; |
| 96 | + private static final String GENERIC_EDITOR_ID = "org.eclipse.ui.genericeditor.GenericEditor"; |
94 | 97 |
|
95 | 98 | private static final String GENERIC_CTF_TRACE_TYPE = "Common Trace Format : Generic CTF Trace"; |
96 | 99 | private static final String LTTNG_KERNEL_TRACE_TYPE = "Common Trace Format : Linux Kernel Trace"; |
@@ -1524,7 +1527,7 @@ private static void verifyTrace(TestTraceInfo traceInfo, int importOptionFlags, |
1524 | 1527 | // If there is no trace type, make sure it can be opened with the text editor |
1525 | 1528 | fBot.waitUntil(ConditionHelpers.isEditorOpened(fBot, traceName)); |
1526 | 1529 | SWTBotEditor editor = fBot.editorByTitle(traceName); |
1527 | | - assertEquals(TEXT_EDITOR_ID, editor.getReference().getId()); |
| 1530 | + assertTrue(editor.getReference().getId(), Arrays.asList(TEXT_EDITOR_ID, GENERIC_EDITOR_ID).contains(editor.getReference().getId())); |
1528 | 1531 | } |
1529 | 1532 | checkTraceLinked(traceItem, (importOptionFlags & ImportTraceWizardPage.OPTION_CREATE_LINKS_IN_WORKSPACE) != 0); |
1530 | 1533 | } |
|
0 commit comments