X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tmf%2Forg.eclipse.tracecompass.tmf.remote.ui.swtbot.tests%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fremote%2Fui%2Fswtbot%2Ftests%2Ffetch%2FFetchRemoteTracesTest.java;h=7ebdde5431275fd7da4b7abae8384d8138b1df3b;hb=c4d57ac1c2197995871705d0e84346335fab5ced;hp=2985ba84924917be1e3412b5ac6a64e2c8a4a0b0;hpb=78ef9da28ad51c95ea5a88f9ede978a6e2574e07;p=deliverable%2Ftracecompass.git

diff --git a/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java b/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
index 2985ba8492..7ebdde5431 100644
--- a/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
@@ -46,7 +46,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.eclipse.tracecompass.ctf.core.tests.synthetictraces.LttngKernelTraceGenerator;
+import org.eclipse.tracecompass.ctf.core.tests.shared.LttngKernelTraceGenerator;
 import org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests.TmfRemoteUISWTBotTestPlugin;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectElement;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectRegistry;
@@ -159,8 +159,8 @@ public class FetchRemoteTracesTest {
                 fBot.waitUntil(new TraceCountCondition(project, 2));
                 List<TmfTraceElement> traces = project.getTracesFolder().getTraces();
                 assertEquals(2, traces.size());
-                testTrace(traces.get(0), CONNECTION_NODE_NAME + "/generated/synthetic-trace", TRACE_TYPE_LTTNG);
-                testTrace(traces.get(1), CONNECTION_NODE_NAME + "/syslog", TRACE_TYPE_SYSLOG);
+                testTrace(traces.get(0), CONNECTION_NODE_NAME + "/resources/generated/synthetic-trace", TRACE_TYPE_LTTNG);
+                testTrace(traces.get(1), CONNECTION_NODE_NAME + "/resources/syslog", TRACE_TYPE_SYSLOG);
             }
         });
     }
@@ -189,7 +189,7 @@ public class FetchRemoteTracesTest {
                 fBot.waitUntil(new TraceCountCondition(project, 1));
                 List<TmfTraceElement> traces = project.getTracesFolder().getTraces();
                 assertEquals(1, traces.size());
-                testTrace(traces.get(0), CONNECTION_NODE_NAME + "/syslog", TRACE_TYPE_SYSLOG);
+                testTrace(traces.get(0), CONNECTION_NODE_NAME + "/resources/syslog", TRACE_TYPE_SYSLOG);
             }
         });
     }
@@ -214,6 +214,37 @@ public class FetchRemoteTracesTest {
         });
     }
 
+    /**
+     * Test to verify that empty files are omitted.
+     */
+    @Test
+    public void testEmptyFile() {
+        testImport(new Runnable() {
+            @Override
+            public void run() {
+                SWTBotTree tree = fBot.tree();
+                fBot.button("Deselect All").click();
+                int length = tree.getAllItems().length;
+                assertTrue(length > 0);
+
+                SWTBotTreeItem groupNode = getTreeItem(fBot, tree, new String[] { CONNECTION_NODE_TEXT, TRACE_GROUP_NODE_TEXT });
+                /*
+                 *  Currently there are 3 items at the location where 1 file has 0 bytes.
+                 *  Verify that empty file is not shown.
+                 */
+                assertEquals(2, groupNode.getItems().length);
+            }
+        }, new Runnable() {
+            @Override
+            public void run() {
+                TmfProjectElement project = TmfProjectRegistry.getProject(ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME), true);
+                List<TmfTraceElement> traces = project.getTracesFolder().getTraces();
+                assertEquals(0, traces.size());
+            }
+        });
+    }
+
+
     /**
      * Test editing a profile
      */