Changeset 1979

Timestamp:

06/24/15 15:38:07 (9 years ago)

Author:

sherbold

Message:

• updated tests

Location:

trunk/autoquest-plugin-uml-test/src/test

Files:

• java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (modified) (12 diffs)
• resources/LogisticsSAUT.uml (added)
• resources/ita_imported_model.uml (added)
• resources/ita_imported_properties.prop (added)
• resources/ita_imported_usagejournal.log (added)
• resources/ita_model.uml (deleted)
• resources/ita_properties.prop (deleted)
• resources/ita_usagejournal.log (deleted)

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

@@ -78 +78 @@
                                                         "deda_ixs_model_scheduling.uml");
 
-    private final static TestData ita_1 = new TestData("ita_properties.prop",
-                                                       "ita_usagejournal.log",
-                                                       "ita_usageprofile.dat", "ita_model.uml",
-                                                       "ita_model_testsuite.uml",
-                                                       "ita_model_scheduling.uml");
+    private final static TestData ita_1 = new TestData("ita_imported_properties.prop",
+                                                       "ita_imported_usagejournal.log",
+                                                       "ita_imported_usageprofile.dat",
+                                                       "ita_imported_model.uml",
+                                                       "ita_imported_model_testsuite.uml",
+                                                       "ita_imported_model_scheduling.uml");
 
     private static class TestData {
@@ -123 +124 @@
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-        new TextConsole(Level.SEVERE);
+        new TextConsole(Level.FINE);
     }
 
@@ -141 +142 @@
          * loadAndPreprocessUsageJournal(testdata, properties);
          * 
-         * Model model =
-         * ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+         * Model model = ModelUtils.loadModel(new
+         * File(ClassLoader.getSystemResource(testdata.dslModelFile).getFile()));
          * 
          * StateMachine stateMachine = (StateMachine)
@@ -160 +161 @@
 
         Model model =
-            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+            ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
+                .getFile()));
 
         StateMachine stateMachine =
@@ -177 +179 @@
 
         // TODO make test case run
-        //UMLUtils.createUMLTransitionSequence(manuallyCreatedSequence, stateMachine);
+        // UMLUtils.createUMLTransitionSequence(manuallyCreatedSequence, stateMachine);
     }
 
@@ -183 +185 @@
     public void testConvertStateMachineToUsageProfile__ITA_1() throws Exception {
         // TODO make test run
-        /*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,
-                                                    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));
-        }
-
-        UMLUtils.convertStateMachineToUsageProfile(umlSequences, stateMachine);
-
-        ModelUtils.writeModelToFile(model, OUTPUT_DIR + "ita_v2_result.uml");*/
+        /*
+         * 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,
+         * 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)); }
+         * 
+         * UMLUtils.convertStateMachineToUsageProfile(umlSequences, stateMachine);
+         * 
+         * ModelUtils.writeModelToFile(model, OUTPUT_DIR + "ita_v2_result.uml");
+         */
     }
 
@@ -277 +276 @@
         Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
         Model model =
-            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+            ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
+                .getFile()));
 
         // run validation
@@ -294 +294 @@
         Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
         Model model =
-            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+            ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
+                .getFile()));
 
         // create a test case for each observed sequence
@@ -313 +314 @@
         Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
         Model model =
-            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+            ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
+                .getFile()));
         IStochasticProcess usageProfile = createUsageProfile(testdata, sequences);
         Collection<List<Event>> generatedSequences =
@@ -340 +342 @@
         Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
         Model model =
-            ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile));
+            ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
+                .getFile()));
         IStochasticProcess usageProfile = createUsageProfile(testdata, sequences);
         Collection<List<Event>> generatedSequences =
@@ -380 +383 @@
         Collection<List<Event>> simpleSOAPSequences = new LinkedList<>();
         for (List<Event> sequence : sequences) {
-            simpleSOAPSequences.add(SOAPUtils.convertToSimpleSOAPEvent(sequence, true));
+            List<Event> simpleSOAPSequence = SOAPUtils.convertToSimpleSOAPEvent(sequence, true);
+            List<Event> simpleSOAPSequenceWithNormalizedMethodNames =
+                SOAPUtils.normalizeOperationNames(simpleSOAPSequence, properties
+                    .getProperty("methodName.prefixToRemove"), properties
+                    .getProperty("methodName.suffixToRemove"));
+            simpleSOAPSequences.add(simpleSOAPSequenceWithNormalizedMethodNames);
         }
 
@@ -397 +405 @@
                 SimpleSOAPEventType eventType = (SimpleSOAPEventType) event.getType();
                 if (ignoredServices.contains(eventType.getServiceName())) {
+                    eventIter.remove();
+                }
+                else if( ignoredServices.contains(eventType.getClientName())) {
                     eventIter.remove();
                 }