tmf: bug 493661 Return analyses who apply to experiment

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.core.tests / src / org / eclipse / tracecompass / tmf / core / tests / analysis / AnalysisModuleHelperTest.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/analysis/AnalysisModuleHelperTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
index 665aa2aa4d0c69fa0277ef681a5eae1bc5f9d837..2c50444888e82e36af587d929014ec4999d08592 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.runtime.Platform;
@@ -30,15 +28,15 @@ import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModuleHelper;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAnalysisManager;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAnalysisModuleHelperConfigElement;
-import org.eclipse.tracecompass.tmf.core.analysis.requirements.TmfAnalysisRequirement;
+import org.eclipse.tracecompass.tmf.core.analysis.requirements.TmfAbstractAnalysisRequirement;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
 import org.eclipse.tracecompass.tmf.core.tests.shared.TmfTestTrace;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.experiment.TmfExperiment;
+import org.eclipse.tracecompass.tmf.tests.stubs.analysis.AnalysisRequirementFactory;
 import org.eclipse.tracecompass.tmf.tests.stubs.analysis.TestAnalysis;
 import org.eclipse.tracecompass.tmf.tests.stubs.analysis.TestAnalysis2;
-import org.eclipse.tracecompass.tmf.tests.stubs.analysis.TestRequirementAnalysis;
 import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfTraceStub;
 import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfTraceStub2;
 import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfTraceStub3;
@@ -134,7 +132,7 @@ public class AnalysisModuleHelperTest {
         assertFalse(fModuleOther.appliesToTraceType(TmfTraceStub.class));
         assertTrue(fModuleOther.appliesToTraceType(TmfTraceStub2.class));
         assertTrue(fModuleOther.appliesToTraceType(TmfTraceStub3.class));
-        assertFalse(fModuleOther.appliesToTraceType(TmfExperiment.class));
+        assertTrue(fModuleOther.appliesToTraceType(TmfExperiment.class));
     }
 
     /**
@@ -356,33 +354,11 @@ public class AnalysisModuleHelperTest {
      */
     @Test
     public void testGetRequirements() {
-        Iterable<TmfAnalysisRequirement> requirements = fReqModule.getAnalysisRequirements();
-        assertNotNull(requirements);
+        Iterable<TmfAbstractAnalysisRequirement> requirements = fReqModule.getAnalysisRequirements();
+        Set<TmfAbstractAnalysisRequirement> expected = ImmutableSet.of(
+                AnalysisRequirementFactory.REQUIREMENT_1,
+                AnalysisRequirementFactory.REQUIREMENT_3);
 
-        Map<String, TmfAnalysisRequirement> rMap = new HashMap<>();
-
-        for (TmfAnalysisRequirement req : requirements) {
-            assertFalse(rMap.containsKey(req.getType()));
-            rMap.put(req.getType(), req);
-        }
-        assertEquals(2, rMap.size());
-
-        /* Test if all types and values have been obtained */
-        TmfAnalysisRequirement req = rMap.get(TestRequirementAnalysis.EVENT_TYPE);
-        assertNotNull(req);
-
-        Set<String> values = req.getValues();
-        assertEquals(3, values.size());
-        assertTrue(values.contains(TestRequirementAnalysis.EXIT_SYSCALL));
-        assertTrue(values.contains(TestRequirementAnalysis.SCHED_SWITCH));
-        assertTrue(values.contains(TestRequirementAnalysis.SCHED_WAKEUP));
-
-        req = rMap.get(TestRequirementAnalysis.FIELD_TYPE);
-        assertNotNull(req);
-
-        values = req.getValues();
-        assertEquals(2, values.size());
-        assertTrue(values.contains(TestRequirementAnalysis.PID));
-        assertTrue(values.contains(TestRequirementAnalysis.TID));
+        assertEquals(expected, requirements);
     }
 }