Changeset 1931 for trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe

Timestamp:

03/23/15 13:37:42 (10 years ago)

Author:

sherbold

Message:

• minor update of tests

File:

• trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (modified) (7 diffs)

trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java

@@ -28 +28 @@
 import java.util.logging.Level;
 
-//import static org.junit.Assert.*;
-
-
-
+import static org.junit.Assert.*;
 
 import org.eclipse.uml2.uml.Interaction;
@@ -45 +42 @@
 import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser;
 import de.ugoe.cs.autoquest.plugin.http.SOAPUtils;
-import de.ugoe.cs.autoquest.plugin.http.eventcore.SOAPEventType;
 import de.ugoe.cs.autoquest.plugin.http.eventcore.SimpleSOAPEventType;
 import de.ugoe.cs.autoquest.testgeneration.RandomWalkGenerator;
@@ -137 +133 @@
     }
 
-    @Test(expected = java.lang.RuntimeException.class)
+    @Test
     public void testCreateUMLTransitionSequence_ITA_1() throws Exception {
         TestData testdata = ita_1;
 
+        /*
+         * Properties properties = loadProperties(testdata); //Collection<List<Event>> sequences =
+         * loadAndPreprocessUsageJournal(testdata, properties);
+         * 
+         * Model model =
+         * ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+         * 
+         * StateMachine stateMachine = (StateMachine)
+         * model.getPackagedElement("StateMachineTransportService", true,
+         * UMLPackage.Literals.STATE_MACHINE, true);
+         * 
+         * 
+         * Collection<List<Event>> umlSequences = new LinkedList<>();
+         * 
+         * // remove everything but transport from sequences for (List<Event> sequence : sequences)
+         * { for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) { Event
+         * event = eventIter.next(); if
+         * (!"TransportService".equals(SOAPUtils.getServiceNameFromEvent(event))) {
+         * eventIter.remove(); } } umlSequences.add(UMLUtils.createUMLTransitionSequence(sequence,
+         * stateMachine)); }
+         */
+
+        Model model =
+            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+
+        StateMachine stateMachine =
+            (StateMachine) model.getPackagedElement("StateMachineTransportService", true,
+                                                    UMLPackage.Literals.STATE_MACHINE, true);
+
+        List<Event> manuallyCreatedSequence = new LinkedList<>();
+        manuallyCreatedSequence
+            .add(new Event(new SimpleSOAPEventType("transportInstructionRequest",
+                                                   "TransportService", "Logistics_Environment",
+                                                   null)));
+        manuallyCreatedSequence
+            .add(new Event(new SimpleSOAPEventType("transportInstructionConfirmationRequest",
+                                                   "materialSupplierService",
+                                                   "Logistics_Environment", null)));
+
+        UMLUtils.createUMLTransitionSequence(manuallyCreatedSequence, stateMachine);
+    }
+
+    @Test
+    public void testConvertStateMachineToUsageProfile__ITA_1() throws Exception {
+        TestData testdata = ita_1;
+        
+        assertTrue("test currently not working", false);
+
         Properties properties = loadProperties(testdata);
         Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
         Model model =
             ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
-
         StateMachine stateMachine =
             (StateMachine) model.getPackagedElement("StateMachineTransportService", true,
@@ -156 +199 @@
             for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) {
                 Event event = eventIter.next();
-                SOAPEventType eventType = (SOAPEventType) event.getType();
-                if (!"TransportService".equals(eventType.getServiceName())) {
+                if (!"TransportService".equals(SOAPUtils.getServiceNameFromEvent(event))) {
                     eventIter.remove();
                 }
@@ -163 +205 @@
             umlSequences.add(UMLUtils.createUMLTransitionSequence(sequence, stateMachine));
         }
-    }
-
-    @Test
-    public void testConvertStateMachineToUsageProfile__ITA_1() throws Exception {
-        TestData testdata = ita_1;
-
-        Properties properties = loadProperties(testdata);
-        Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
-
-        Model model =
-            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
-
-        // remove everything but transport from sequences
-        for (List<Event> sequence : sequences) {
-            for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) {
-                Event event = eventIter.next();
-                SOAPEventType eventType = (SOAPEventType) event.getType();
-                if (!"TransportService".equals(eventType.getServiceName())) {
-                    eventIter.remove();
-                }
-            }
-        }
-
-        StateMachine stateMachine =
-            (StateMachine) model.getPackagedElement("StateMachineTransportService", true,
-                                                    UMLPackage.Literals.STATE_MACHINE, true);
-
-        UMLUtils.convertStateMachineToUsageProfile(sequences, stateMachine);
+
+        UMLUtils.convertStateMachineToUsageProfile(umlSequences, stateMachine);
 
         ModelUtils.writeModelToFile(model, OUTPUT_DIR + "ita_v2_result.uml");
@@ -304 +320 @@
         int[] lengths = new int[generatedSequences.size()];
         for (List<Event> sequence : generatedSequences) {
-            interactions.add(UMLUtils.createInteractionFromEventSequence(sequence, model,
-                                                        properties.getProperty("testcases.prefix") +
-                                                            "_" + i,
-                                                        properties.getProperty("test.context")));
+            interactions.add(UMLUtils
+                .createInteractionFromEventSequence(sequence, model,
+                                                    properties.getProperty("testcases.prefix") +
+                                                        "_" + i,
+                                                    properties.getProperty("test.context")));
             lengths[i - 1] = sequence.size();
             i++;
@@ -385 +402 @@
     }
 
-    private IStochasticProcess createUsageProfile(TestData testdata, Collection<List<Event>> sequences)
+    private IStochasticProcess createUsageProfile(TestData testdata,
+                                                  Collection<List<Event>> sequences)
         throws Exception
     {