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

Timestamp:

03/11/15 15:43:03 (10 years ago)

Author:

sherbold

Message:

• default values are added to parameters of operation calls in generated UML interactions
• new model of ITA pilot

File:

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

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

@@ -205 +205 @@
     
     @Test
-    public void testHL7v2_1() throws Exception {
-        // parse log file
-        HTTPLogParser parser =
-            new HTTPLogParser(new File(ClassLoader
-                .getSystemResource("hl7_servicenamemap.txt")
-                .getFile()));
-        parser
-            .parseFile(new File(ClassLoader
-                .getSystemResource("testCreateInteractionFromEventSequence_1_usagedata.log")
-                .getFile()));
-        Collection<List<Event>> httpSequences = parser.getSequences();
-
-        
-        Model model =
-            ModelUtils.loadModel(ClassLoader
-                .getSystemResourceAsStream("hl7model_v2.uml"));
-
-        for (List<Event> httpSequence : httpSequences) {
-            for (Iterator<Event> eventIter = httpSequence.iterator(); eventIter.hasNext();) {
-                Event event = eventIter.next();
-                if (!(event.getType() instanceof SOAPEventType)) {
-                    eventIter.remove();
-                }
-            }
-
-            UMLUtils.createInteractionFromEventSequence(httpSequence, model, "testSequence", "RLUSTestSuite_1");
-        }
-
-        ModelUtils.writeModelToFile(model, OUTPUT_DIR + "testCreateInteractionFromEventSequence_2_result.uml");
-        
-    }
-
-    @Test
     public void testCalculateUsageScore_1() throws Exception {
         // parse log file
@@ -372 +339 @@
         }
     }
+    
+    @Test
+    public void testValidateModelWithLog_ITA_v2() throws Exception {
+        HTTPLogParser parser =
+                new HTTPLogParser(new File(ClassLoader
+                    .getSystemResource("ita_v2_servicenamemap.txt")
+                    .getFile()));
+        parser
+            .parseFile(new File(ClassLoader
+                .getSystemResource("ita_usagejournal_v2_2.log")
+                .getFile()));
+        Collection<List<Event>> httpSequences = parser.getSequences();
+
+        
+        Model model =
+            ModelUtils.loadModel(ClassLoader
+                .getSystemResourceAsStream("ita_model_v2.uml"));
+        
+        int violations = UMLUtils.validateModelWithLog(httpSequences, model, null);
+        if( violations==0 ) {
+            System.out.println("No problems found.");
+        } else {
+            System.out.println(violations + " violations found.");
+        }
+        
+        // remove everything but transport from sequences
+        for (List<Event> httpSequence : httpSequences) {
+            for (Iterator<Event> eventIter = httpSequence.iterator(); eventIter.hasNext();) {
+                Event event = eventIter.next();
+                if (!(event.getType() instanceof SOAPEventType)) {
+                    eventIter.remove();
+                } else {
+                    SOAPEventType eventType = (SOAPEventType) event.getType();
+                    if( !"TransportService".equals(eventType.getServiceName()) )  {
+                        eventIter.remove();
+                    }
+                }
+            }
+            
+            UMLUtils.createInteractionFromEventSequence(httpSequence, model, "foo", "LogisticsTestSuite");
+        }
+        
+        ModelUtils.writeModelToFile(model, OUTPUT_DIR + "ita_v2_result.uml");
+        
+    }
 
     private void deleteFiles(File file) {