releng: Fix ProjectExplorerTracesFolderTest

The generated clashing LTTng traces in TestDirectoryStructureUtil are
changed to have a duration of 1001 ns (not 1000 ns) for 1001 events.

This prevents the time delta between events from flooring down to 0 ns,
which causes all events and all packet begin and end times to be equal.

There is probably another bug in the CTF reader that seeks to the
incorrect packet when there are multiple packets with the same begin and
end times.

Change-Id: Icea44a26f9b4913c2bee7d0bddae575a7263b58f
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/95961
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
index 201cc00a29520f175a5839ce7080e125a25a2ea6..b27fdb067c2c85b776d32a75cd65ff40491b27dd 100644 (file)
--- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
+++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2016 Ericsson
+ * Copyright (c) 2016, 2017 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -1524,13 +1524,11 @@ public class ProjectExplorerTracesFolderTest {
     }
 
     private static void checkTraceType(SWTBotTreeItem traceItem, String traceType) {
-        //FIXME: getTraceProperty() sometimes fails in WaitUtils.waitForJobs due to TmfEventsCache Fetching Events job never completing
-        //assertEquals(traceType, getTraceProperty(traceItem, "type"));
+        assertEquals(traceType, getTraceProperty(traceItem, "type"));
     }
 
     private static void checkTraceLinked(SWTBotTreeItem traceItem, boolean linked) {
-        //FIXME: getTraceProperty() sometimes fails in WaitUtils.waitForJobs due to TmfEventsCache Fetching Events job never completing
-        //assertEquals(Boolean.toString(linked), getTraceProperty(traceItem, "linked"));
+        assertEquals(Boolean.toString(linked), getTraceProperty(traceItem, "linked"));
     }
 
     private static String getTraceProperty(SWTBotTreeItem traceItem, String property) {

diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/TestDirectoryStructureUtil.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/TestDirectoryStructureUtil.java
index bcad2e3474978f3b33af610e892045ce01adb789..7323c5ea9fd66433816bec11680eac5c59283e03 100644 (file)
--- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/TestDirectoryStructureUtil.java
+++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/TestDirectoryStructureUtil.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2016 Ericsson
+ * Copyright (c) 2016, 2017 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -185,8 +185,8 @@ public class TestDirectoryStructureUtil {
         ustGenerator.writeTrace(new File(importDir.getAbsolutePath() + File.separator + "simple_server-thread1"));
         ustGenerator.writeTrace(new File(importDir.getAbsolutePath() + File.separator + "simple_server-thread2"));
 
-        kernelGenerator = new LttngTraceGenerator(1000, 1001, 1);
-        ustGenerator = new LttngTraceGenerator(1000, 1001, 1, false);
+        kernelGenerator = new LttngTraceGenerator(1001, 1001, 1);
+        ustGenerator = new LttngTraceGenerator(1001, 1001, 1, false);
         kernelGenerator.writeTrace(new File(importDir.getAbsolutePath() + File.separator + CLASHES_DIR_NAME + File.separator + "kernel-overlap-testing"));
         ustGenerator.writeTrace(new File(importDir.getAbsolutePath() + File.separator + CLASHES_DIR_NAME + File.separator + "ust-overlap-testing"));
         ustGenerator.writeTrace(new File(importDir.getAbsolutePath() + File.separator + CLASHES_DIR_NAME + File.separator + "simple_server-thread1"));