TMF: Rework some test code for XML analysis to make it easier to add test cases

[deliverable/tracecompass.git] / org.eclipse.tracecompass.tmf.analysis.xml.core.tests / src / org / eclipse / tracecompass / tmf / analysis / xml / core / tests / stateprovider / StateProviderModuleTest.java

diff --git a/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderModuleTest.java b/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderModuleTest.java
index 5503c27a875f167b8afd06068f488516cf9f2e86..be7998088df866a1522e58b25b50412caf74ff76 100644 (file)
--- a/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderModuleTest.java
+++ b/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderModuleTest.java
@@ -18,15 +18,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.stateprovider.TmfXmlStrings;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.stateprovider.XmlStateSystemModule;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.tests.common.TmfXmlTestFiles;
@@ -37,7 +29,6 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 /**
  * Test suite for the XmlStateSystemModule Test. It tests the reading of the
@@ -53,33 +44,13 @@ public class StateProviderModuleTest {
 
     private XmlStateSystemModule fModule;
 
-    private static Document getXmlDocumentFromFile(File file) {
-        /* Initialize the state provider module */
-        try {
-            DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-
-            Document doc = dBuilder.parse(file);
-
-            doc.getDocumentElement().normalize();
-            return doc;
-        } catch (ParserConfigurationException e) {
-            fail("Xml document parse exception");
-        } catch (SAXException e) {
-            fail("Exception parsing xml file");
-        } catch (IOException e) {
-            fail("File io exception");
-        }
-        return null;
-    }
-
     /**
      * Test the module construction
      */
     @Test
     public void testModuleConstruction() {
 
-        Document doc = getXmlDocumentFromFile(TmfXmlTestFiles.VALID_FILE.getFile());
+        Document doc = TmfXmlTestFiles.VALID_FILE.getXmlDocument();
         assertNotNull(doc);
 
         /* get State Providers modules */
@@ -89,10 +60,11 @@ public class StateProviderModuleTest {
         Element node = (Element) stateproviderNodes.item(0);
         fModule = new XmlStateSystemModule();
         String moduleId = node.getAttribute(TmfXmlStrings.ID);
+        assertNotNull(moduleId);
         fModule.setId(moduleId);
         assertEquals(ANALYSIS_ID, fModule.getId());
 
-        fModule.setXmlFile(new Path(TmfXmlTestFiles.VALID_FILE.getFile().getAbsolutePath()));
+        fModule.setXmlFile(TmfXmlTestFiles.VALID_FILE.getPath());
 
         assertEquals(ANALYSIS_NAME, fModule.getName());
     }
@@ -104,7 +76,7 @@ public class StateProviderModuleTest {
     public void testModuleExecution() {
         assumeTrue(CtfTmfTestTrace.KERNEL.exists());
 
-        Document doc = getXmlDocumentFromFile(TmfXmlTestFiles.VALID_FILE.getFile());
+        Document doc = TmfXmlTestFiles.VALID_FILE.getXmlDocument();
         assertNotNull(doc);
 
         /* get State Providers modules */
@@ -113,9 +85,10 @@ public class StateProviderModuleTest {
         Element node = (Element) stateproviderNodes.item(0);
         fModule = new XmlStateSystemModule();
         String moduleId = node.getAttribute(TmfXmlStrings.ID);
+        assertNotNull(moduleId);
         fModule.setId(moduleId);
 
-        fModule.setXmlFile(new Path(TmfXmlTestFiles.VALID_FILE.getFile().getAbsolutePath()));
+        fModule.setXmlFile(TmfXmlTestFiles.VALID_FILE.getPath());
 
         try (CtfTmfTrace trace = CtfTmfTestTrace.KERNEL.getTrace();) {
             fModule.setTrace(trace);