Merge master in TmfTraceModel

[deliverable/tracecompass.git] / org.eclipse.linuxtools.ctf.core.tests / src / org / eclipse / linuxtools / ctf / core / tests / trace / StreamInputReaderTest.java

diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java
index 4ecd4be9985edb154b65beb30c7db706a62fa682..f10138f57665c186b7fc59f00a7e11129121271a 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java
+++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java
@@ -13,9 +13,9 @@ import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition;
 import org.eclipse.linuxtools.ctf.core.tests.TestParams;
 import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException;
 import org.eclipse.linuxtools.ctf.core.trace.CTFTrace;
-import org.eclipse.linuxtools.ctf.core.trace.Stream;
-import org.eclipse.linuxtools.ctf.core.trace.StreamInput;
 import org.eclipse.linuxtools.ctf.core.trace.StreamInputReader;
+import org.eclipse.linuxtools.internal.ctf.core.trace.Stream;
+import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInput;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,7 +23,7 @@ import org.junit.Test;
 /**
  * The class <code>StreamInputReaderTest</code> contains tests for the class
  * <code>{@link StreamInputReader}</code>.
- * 
+ *
  * @author ematkho
  * @version $Revision: 1.0 $
  */
@@ -33,7 +33,7 @@ public class StreamInputReaderTest {
 
     /**
      * Launch the test.
-     * 
+     *
      * @param args
      *            the command line arguments
      */
@@ -43,13 +43,15 @@ public class StreamInputReaderTest {
 
     /**
      * Perform pre-test initialization.
+     *
+     * @throws CTFReaderException
      */
     @Before
-    public void setUp() {
-        fixture = createStreamInputReader();
+    public void setUp() throws CTFReaderException {
+        fixture = getStreamInputReader();
         fixture.setName(1);
         fixture.setCurrentEvent(new EventDefinition(new EventDeclaration(),
-                createStreamInputReader()));
+                getStreamInputReader()));
     }
 
     /**
@@ -60,7 +62,7 @@ public class StreamInputReaderTest {
         // Add additional tear down code here
     }
 
-    private static StreamInputReader createStreamInputReader() {
+    private static StreamInputReader getStreamInputReader() throws CTFReaderException {
         CTFTrace trace = TestParams.createTrace();
         Stream s = trace.getStream((long) 0);
         Set<StreamInput> streamInput = s.getStreamInputs();
@@ -90,7 +92,7 @@ public class StreamInputReaderTest {
     /**
      * Run the StreamInputReader(StreamInput) constructor test, with an invalid
      * trace.
-     * 
+     *
      * @throws CTFReaderException
      */
     @Test(expected = CTFReaderException.class)
@@ -138,18 +140,9 @@ public class StreamInputReaderTest {
         assertEquals(1, result);
     }
 
-    /**
-     * Run the StreamInput getStreamInput() method test.
-     */
-    @Test
-    public void testGetStreamInput() {
-        StreamInput result = fixture.getStreamInput();
-        assertNotNull(result);
-    }
-
     /**
      * Run the void goToLastEvent() method test.
-     * 
+     *
      * @throws CTFReaderException
      */
     @Test
@@ -178,11 +171,13 @@ public class StreamInputReaderTest {
     /**
      * Run the seek test. Seek by passing an EventDefinition to which we've
      * given the timestamp we want.
+     *
+     * @throws CTFReaderException
      */
     @Test
-    public void testSeek_eventDefinition() {
+    public void testSeek_eventDefinition() throws CTFReaderException {
         EventDefinition eventDefinition = new EventDefinition(
-                new EventDeclaration(), createStreamInputReader());
+                new EventDeclaration(), getStreamInputReader());
         eventDefinition.timestamp = 1L;
         fixture.setCurrentEvent(eventDefinition);
     }