ss: Move plugins to Trace Compass namespace

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

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/analysis/AnalysisModuleHelperTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
index 1a414d18ac0848597576047ed8aa3f982e7a69e6..1c9ff0b8daefa5d503c4628b3249220c37949b0e 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
@@ -32,8 +32,6 @@ import org.eclipse.linuxtools.tmf.core.analysis.TmfAnalysisManager;
 import org.eclipse.linuxtools.tmf.core.analysis.TmfAnalysisModuleHelperConfigElement;
 import org.eclipse.linuxtools.tmf.core.analysis.TmfAnalysisRequirement;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfAnalysisException;
-import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType;
-import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper;
 import org.eclipse.linuxtools.tmf.core.tests.shared.TmfTestTrace;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
@@ -42,12 +40,15 @@ import org.eclipse.linuxtools.tmf.tests.stubs.analysis.TestAnalysis2;
 import org.eclipse.linuxtools.tmf.tests.stubs.analysis.TestRequirementAnalysis;
 import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
 import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub2;
+import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub3;
 import org.eclipse.osgi.util.NLS;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * Test suite for the {@link TmfAnalysisModuleHelperConfigElement} class
  *
@@ -55,8 +56,6 @@ import org.osgi.framework.Bundle;
  */
 public class AnalysisModuleHelperTest {
 
-    private static final String VALID_TRACE_TYPE = "org.eclipse.linuxtools.tmf.core.tests.tracetype";
-
     private IAnalysisModuleHelper fModule;
     private IAnalysisModuleHelper fModuleOther;
     private IAnalysisModuleHelper fReqModule;
@@ -120,11 +119,13 @@ public class AnalysisModuleHelperTest {
         assertFalse(fModule.appliesToTraceType(TmfTrace.class));
         assertTrue(fModule.appliesToTraceType(TmfTraceStub.class));
         assertTrue(fModule.appliesToTraceType(TmfTraceStub2.class));
+        assertFalse(fModule.appliesToTraceType(TmfTraceStub3.class));
 
         /* stub module 2 */
         assertFalse(fModuleOther.appliesToTraceType(TmfTrace.class));
         assertFalse(fModuleOther.appliesToTraceType(TmfTraceStub.class));
         assertTrue(fModuleOther.appliesToTraceType(TmfTraceStub2.class));
+        assertTrue(fModuleOther.appliesToTraceType(TmfTraceStub3.class));
     }
 
     /**
@@ -136,20 +137,16 @@ public class AnalysisModuleHelperTest {
     public void testNewModule() {
         /* Test analysis module with traceStub */
         Exception exception = null;
-        IAnalysisModule module = null;
-        try {
-            module = fModule.newModule(TmfTestTrace.A_TEST_10K.getTrace());
+        try (IAnalysisModule module = fModule.newModule(TmfTestTrace.A_TEST_10K.getTrace());) {
+            assertNotNull(module);
+            assertTrue(module instanceof TestAnalysis);
         } catch (TmfAnalysisException e) {
             exception = e;
         }
         assertNull(exception);
-        assertNotNull(module);
-        assertTrue(module instanceof TestAnalysis);
 
         /* TestAnalysis2 module with trace, should return an exception */
-        module = null;
-        try {
-            module = fModuleOther.newModule(TmfTestTrace.A_TEST_10K.getTrace());
+        try (IAnalysisModule module = fModuleOther.newModule(TmfTestTrace.A_TEST_10K.getTrace());) {
         } catch (TmfAnalysisException e) {
             exception = e;
         }
@@ -158,15 +155,13 @@ public class AnalysisModuleHelperTest {
 
         /* TestAnalysis2 module with a TraceStub2 */
         exception = null;
-        module = null;
-        try {
-            module = fModuleOther.newModule(fTrace);
+        try (IAnalysisModule module = fModuleOther.newModule(fTrace);) {
+            assertNotNull(module);
+            assertTrue(module instanceof TestAnalysis2);
         } catch (TmfAnalysisException e) {
             exception = e;
         }
         assertNull(exception);
-        assertNotNull(module);
-        assertTrue(module instanceof TestAnalysis2);
     }
 
     /**
@@ -181,48 +176,47 @@ public class AnalysisModuleHelperTest {
          * able to set the parameter
          */
         IAnalysisModuleHelper helper = TmfAnalysisManager.getAnalysisModule(AnalysisManagerTest.MODULE_PARAM);
-        IAnalysisModule module;
-        try {
-            module = helper.newModule(trace);
+        try (IAnalysisModule module = helper.newModule(trace);) {
+            assertNull(module.getParameter(TestAnalysis.PARAM_TEST));
+            module.setParameter(TestAnalysis.PARAM_TEST, 1);
+            assertEquals(1, module.getParameter(TestAnalysis.PARAM_TEST));
+
         } catch (TmfAnalysisException e1) {
             fail(e1.getMessage());
             return;
         }
 
-        assertNull(module.getParameter(TestAnalysis.PARAM_TEST));
-        module.setParameter(TestAnalysis.PARAM_TEST, 1);
-        assertEquals(1, module.getParameter(TestAnalysis.PARAM_TEST));
-
         /* This module has a parameter with default value */
         helper = TmfAnalysisManager.getAnalysisModule(AnalysisManagerTest.MODULE_PARAM_DEFAULT);
-        try {
-            module = helper.newModule(trace);
+        try (IAnalysisModule module = helper.newModule(trace);) {
+            assertEquals(3, module.getParameter(TestAnalysis.PARAM_TEST));
+            module.setParameter(TestAnalysis.PARAM_TEST, 1);
+            assertEquals(1, module.getParameter(TestAnalysis.PARAM_TEST));
+
         } catch (TmfAnalysisException e1) {
             fail(e1.getMessage());
             return;
         }
-        assertEquals(3, module.getParameter(TestAnalysis.PARAM_TEST));
-        module.setParameter(TestAnalysis.PARAM_TEST, 1);
-        assertEquals(1, module.getParameter(TestAnalysis.PARAM_TEST));
 
         /*
          * This module does not have a parameter so setting it should throw an
          * error
          */
         helper = TmfAnalysisManager.getAnalysisModule(AnalysisManagerTest.MODULE_SECOND);
-        try {
-            module = helper.newModule(fTrace);
+        Exception exception = null;
+        try (IAnalysisModule module = helper.newModule(fTrace);) {
+
+            assertNull(module.getParameter(TestAnalysis.PARAM_TEST));
+
+            try {
+                module.setParameter(TestAnalysis.PARAM_TEST, 1);
+            } catch (RuntimeException e) {
+                exception = e;
+            }
         } catch (TmfAnalysisException e1) {
             fail(e1.getMessage());
             return;
         }
-        assertNull(module.getParameter(TestAnalysis.PARAM_TEST));
-        Exception exception = null;
-        try {
-            module.setParameter(TestAnalysis.PARAM_TEST, 1);
-        } catch (RuntimeException e) {
-            exception = e;
-        }
         assertNotNull(exception);
     }
 
@@ -232,16 +226,9 @@ public class AnalysisModuleHelperTest {
      */
     @Test
     public void testGetValidTraceTypes() {
-        TraceTypeHelper traceTypeHelper = TmfTraceType.getTraceType(VALID_TRACE_TYPE);
-        int traceTypeCount = 0;
+        Set<Class<? extends ITmfTrace>> expected = ImmutableSet.of((Class<? extends ITmfTrace>) TmfTraceStub.class, TmfTraceStub2.class, TmfTraceStub3.class);
         Iterable<Class<? extends ITmfTrace>> traceTypes = fReqModule.getValidTraceTypes();
-        for (Class<? extends ITmfTrace> traceType : traceTypes) {
-            assertTrue(fReqModule.appliesToTraceType(traceType));
-            assertNotNull(traceTypeHelper);
-            assertEquals(traceTypeHelper.getTraceClass(), traceType);
-            traceTypeCount++;
-        }
-        assertEquals(1, traceTypeCount);
+        assertEquals(expected, traceTypes);
     }
 
     /**