Index: /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java =================================================================== --- /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (revision 1913) +++ /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (revision 1914) @@ -316,5 +316,5 @@ @Test - public void testValidateModelWithLog_HL7_v2() throws Exception { + public void testValidateModelWithLog_HL7_RLUS_v3() throws Exception { HTTPLogParser parser = new HTTPLogParser(new File(ClassLoader @@ -330,5 +330,49 @@ 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 httpSequence : httpSequences) { + for (Iterator 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> httpSequences = parser.getSequences(); + + + Model model = + ModelUtils.loadModel(ClassLoader + .getSystemResourceAsStream("hl7model_v3.uml")); int violations = UMLUtils.validateModelWithLog(httpSequences, model, "IXSTestSuite_1"); @@ -338,4 +382,23 @@ System.out.println(violations + " violations found."); } + + // remove everything but rlusService from sequences + for (List httpSequence : httpSequences) { + for (Iterator 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"); } Index: /trunk/autoquest-plugin-uml-test/src/test/resources/hl7_ixs_servicenamemap.txt =================================================================== --- /trunk/autoquest-plugin-uml-test/src/test/resources/hl7_ixs_servicenamemap.txt (revision 1914) +++ /trunk/autoquest-plugin-uml-test/src/test/resources/hl7_ixs_servicenamemap.txt (revision 1914) @@ -0,0 +1,6 @@ +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 = ixsEnvironment Index: /trunk/autoquest-plugin-uml-test/src/test/resources/hl7_servicenamemap.txt =================================================================== --- /trunk/autoquest-plugin-uml-test/src/test/resources/hl7_servicenamemap.txt (revision 1913) +++ /trunk/autoquest-plugin-uml-test/src/test/resources/hl7_servicenamemap.txt (revision 1914) @@ -1,5 +1,6 @@ -/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 Index: /trunk/autoquest-plugin-uml-test/src/test/resources/hl7model_v3.uml =================================================================== --- /trunk/autoquest-plugin-uml-test/src/test/resources/hl7model_v3.uml (revision 1914) +++ /trunk/autoquest-plugin-uml-test/src/test/resources/hl7model_v3.uml (revision 1914) @@ -0,0 +1,1863 @@ + + + + + version 0.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +