ss: Move plugins to Trace Compass namespace

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / synchronization / SyncTest.java

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/SyncTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/SyncTest.java
index 46742f4de6d7d5d26654a8e2e0ea16c96e613e72..270df9f851dd9e0794c2ece90044437dfedf247f 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/SyncTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/synchronization/SyncTest.java
@@ -14,13 +14,17 @@ package org.eclipse.linuxtools.tmf.core.tests.synchronization;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.Collection;
+import java.util.LinkedList;
+
 import org.eclipse.linuxtools.tmf.core.event.matching.TmfEventDependency;
 import org.eclipse.linuxtools.tmf.core.synchronization.ITmfTimestampTransform;
-import org.eclipse.linuxtools.tmf.core.synchronization.SyncAlgorithmFullyIncremental;
 import org.eclipse.linuxtools.tmf.core.synchronization.SynchronizationAlgorithm;
 import org.eclipse.linuxtools.tmf.core.synchronization.SynchronizationAlgorithm.SyncQuality;
-import org.eclipse.linuxtools.tmf.core.synchronization.TmfTimestampTransform;
+import org.eclipse.linuxtools.tmf.core.synchronization.SynchronizationAlgorithmFactory;
+import org.eclipse.linuxtools.tmf.core.synchronization.TimestampTransformFactory;
 import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyncEventStub;
 import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
 import org.junit.Before;
@@ -35,7 +39,7 @@ import org.junit.Test;
 public class SyncTest {
 
     private TmfTraceStub t1, t2;
-    private TmfTraceStub[] fTraces;
+    private Collection<ITmfTrace> fTraces;
 
     /**
      * Initializing the traces
@@ -46,7 +50,10 @@ public class SyncTest {
         t1.init("t1");
         t2 = new TmfTraceStub();
         t2.init("t2");
-        TmfTraceStub[] traces = { t1, t2 };
+
+        Collection<ITmfTrace> traces = new LinkedList<>();
+        traces.add(t1);
+        traces.add(t2);
         fTraces = traces;
     }
 
@@ -57,7 +64,7 @@ public class SyncTest {
     @Test
     public void testFullyIncremental() {
 
-        SynchronizationAlgorithm syncAlgo = new SyncAlgorithmFullyIncremental();
+        SynchronizationAlgorithm syncAlgo = SynchronizationAlgorithmFactory.getFullyIncrementalAlgorithm();
 
         syncAlgo.init(fTraces);
 
@@ -121,9 +128,9 @@ public class SyncTest {
         ITmfTimestampTransform tt2 = syncAlgo.getTimestampTransform(t2);
         ITmfTimestampTransform tt1 = syncAlgo.getTimestampTransform(t1);
 
-        assertEquals(syncAlgo.getTimestampTransform("t1"), tt1);
-        assertEquals(TmfTimestampTransform.IDENTITY, tt1);
-        assertEquals(syncAlgo.getTimestampTransform("t2"), tt2);
+        assertEquals(syncAlgo.getTimestampTransform(t1.getHostId()), tt1);
+        assertEquals(TimestampTransformFactory.getDefaultTransform(), tt1);
+        assertEquals(syncAlgo.getTimestampTransform(t2.getHostId()), tt2);
 
         /* Make the two hulls intersect */
         syncAlgo.addMatch(
@@ -144,7 +151,7 @@ public class SyncTest {
     @Test
     public void testOneHull() {
 
-        SynchronizationAlgorithm syncAlgo = new SyncAlgorithmFullyIncremental();
+        SynchronizationAlgorithm syncAlgo = SynchronizationAlgorithmFactory.getFullyIncrementalAlgorithm();
 
         syncAlgo.init(fTraces);
 
@@ -186,7 +193,7 @@ public class SyncTest {
     @Test
     public void testDisjoint() {
 
-        SynchronizationAlgorithm syncAlgo = new SyncAlgorithmFullyIncremental();
+        SynchronizationAlgorithm syncAlgo = SynchronizationAlgorithmFactory.getFullyIncrementalAlgorithm();
 
         syncAlgo.init(fTraces);