Changeset 1914

Timestamp:

03/12/15 09:45:52 (9 years ago)

Author:

sherbold

Message:

• updated tests with new model from Dedalus

Location:

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

Files:

• java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (modified) (3 diffs)
• resources/hl7_ixs_servicenamemap.txt (added)
• resources/hl7_servicenamemap.txt (modified) (1 diff)
• resources/hl7model_v3.uml (added)

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

@@ -316 +316 @@
     
     @Test
-    public void testValidateModelWithLog_HL7_v2() throws Exception {
+    public void testValidateModelWithLog_HL7_RLUS_v3() throws Exception {
         HTTPLogParser parser =
                 new HTTPLogParser(new File(ClassLoader
@@ -330 +330 @@
         Model model =
             ModelUtils.loadModel(ClassLoader
-                .getSystemResourceAsStream("hl7model_v2.uml"));
+                .getSystemResourceAsStream("hl7model_v3.uml"));
+        
+        int violations = UMLUtils.validateModelWithLog(httpSequences, model, "RLUSTestSuite_1");
+        if( violations==0 ) {
+            System.out.println("No problems found.");
+        } else {
+            System.out.println(violations + " violations found.");
+        }
+        
+        // remove everything but rlusService 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( !"rlusService".equals(eventType.getServiceName()) )  {
+                        eventIter.remove();
+                    }
+                }
+            }
+            
+            UMLUtils.createInteractionFromEventSequence(httpSequence, model, "foo", "RLUSTestSuite_1");
+        }
+        
+        ModelUtils.writeModelToFile(model, OUTPUT_DIR + "hl7_v3_result.uml");
+    }
+    
+    @Test
+    public void testValidateModelWithLog_HL7_IXS_v3() throws Exception {
+        HTTPLogParser parser =
+                new HTTPLogParser(new File(ClassLoader
+                    .getSystemResource("hl7_ixs_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_v3.uml"));
         
         int violations = UMLUtils.validateModelWithLog(httpSequences, model, "IXSTestSuite_1");
@@ -338 +382 @@
             System.out.println(violations + " violations found.");
         }
+        
+        // remove everything but rlusService 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( !"ixsService".equals(eventType.getServiceName()) )  {
+                        eventIter.remove();
+                    }
+                }
+            }
+            
+            UMLUtils.createInteractionFromEventSequence(httpSequence, model, "foo", "IXSTestSuite_1");
+        }
+        
+        ModelUtils.writeModelToFile(model, OUTPUT_DIR + "hl7_v3_result.uml");
     }
     

trunk/autoquest-plugin-uml-test/src/test/resources/hl7_servicenamemap.txt

@@ -1 @@
-/midas/rlus/query/xdw = rlusService
-/midas/rlus/update/xdw = rlusService
-/midas/rlus/update/cda2report = rlusService
-/midas/ixsmq/update/pocdpatient = ixsService
-/midas/ixsmq/query/pocdpatient = ixsService
+serviceName.path./midas/rlus/query/xdw = rlusService
+serviceName.path./midas/rlus/update/xdw = rlusService
+serviceName.path./midas/rlus/update/cda2report = rlusService
+serviceName.path./midas/ixsmq/update/pocdpatient = ixsService
+serviceName.path./midas/ixsmq/query/pocdpatient = ixsService
+clientName.receiver.port.6000 = rlusEnvironment