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 1609) +++ trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (revision 1625) @@ -58,17 +58,17 @@ */ public class UMLUtilsTest { - + private final static String OUTPUT_DIR = "target/tmp/test-outputs/"; - + /** * */ - @After - public void tearDown() throws Exception { - deleteFiles(new File(OUTPUT_DIR)); - } - - @Test(expected=java.lang.RuntimeException.class) - public void createUMLTransitionSequence_1() throws Exception { + @After + public void tearDown() throws Exception { + deleteFiles(new File(OUTPUT_DIR)); + } + + @Test(expected = java.lang.RuntimeException.class) + public void testCreateUMLTransitionSequence_1() throws Exception { // parse log file HTTPLogParser parser = new HTTPLogParser(); @@ -101,7 +101,7 @@ } } - + @Test - public void convertStateMachineToUsageProfile_1() throws Exception { + public void testConvertStateMachineToUsageProfile_1() throws Exception { // parse log file HTTPLogParser parser = new HTTPLogParser(); @@ -131,5 +131,6 @@ } - List> matchingSequences = UMLUtils.determineMatchingTransitionSequences(httpSequence, stateMachine); + List> matchingSequences = + UMLUtils.determineMatchingTransitionSequences(httpSequence, stateMachine); if (matchingSequences.size() >= 1) { List umlEventSequence = new LinkedList<>(); @@ -141,24 +142,56 @@ } UMLUtils.convertStateMachineToUsageProfile(umlSequences, stateMachine); - + writeModelToFile(model, OUTPUT_DIR + "convertStateMachineToUsageProfile_1.uml"); } - + + @Test + public void testCreateInteractionFromEventSequence_1() throws Exception { + // parse log file + HTTPLogParser parser = + new HTTPLogParser(new File(ClassLoader + .getSystemResource("testCreateInteractionFromEventSequence_1_properties.txt").getFile())); + parser.parseFile(new File(ClassLoader + .getSystemResource("testCreateInteractionFromEventSequence_1_usagedata.log").getFile())); + Collection> httpSequences = parser.getSequences(); + Model model = + loadModelFromInputStream(ClassLoader + .getSystemResourceAsStream("testCreateInteractionFromEventSequence_1_model.uml")); + + for (List httpSequence : httpSequences) { + for (Iterator eventIter = httpSequence.iterator(); eventIter.hasNext();) { + Event event = eventIter.next(); + if (!(event.getType() instanceof SOAPEventType)) { + eventIter.remove(); + } + } + + UMLUtils.createInteractionFromEventSequence(httpSequence, model, "testSequence"); + } + //writeModelToFile(model, "testCreateInteractionFromEventSequence_1_result.uml"); + } + private static void writeModelToFile(Model model, String filename) throws IOException { final ResourceSet resourceSet = new ResourceSetImpl(); + UMLResourcesUtil.init(resourceSet); resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new ResourceFactoryImpl() { @Override public Resource createResource(URI uri) { - return new XMIResourceImpl(uri); + return new XMIResourceImpl(uri) { + @Override + public boolean useUUIDs() + { + return true; + } + }; } }); Resource resource = resourceSet.createResource(URI.createURI("binresource")); - + resource.getContents().add(model); FileOutputStream fos; File file = new File(filename); - file.getParentFile().mkdirs(); fos = new FileOutputStream(file); resource.save(fos, null); @@ -171,5 +204,4 @@ resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE); resourceSet.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE); - resourceSet.getResourceFactoryRegistry(); resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() .put(Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); @@ -184,8 +216,4 @@ Resource resource = new XMIResourceImpl(); - /* - * XMIResource.XMLMap xmlMap = new XMLMapImpl(); Map options = new HashMap(); - * options.put(XMIResource.OPTION_XML_MAP, xmlMap); - */ try { @@ -201,20 +229,20 @@ } - private void deleteFiles(File file) { - if (file.exists()) { - if (file.isDirectory()) { - for (File child : file.listFiles()) { - deleteFiles(child); - } - } - - try { - file.delete(); - } - catch (Exception e) { - // ignore and delete as much as possible - } - } - } + private void deleteFiles(File file) { + if (file.exists()) { + if (file.isDirectory()) { + for (File child : file.listFiles()) { + deleteFiles(child); + } + } + + try { + file.delete(); + } + catch (Exception e) { + // ignore and delete as much as possible + } + } + } } Index: trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_model.uml =================================================================== --- trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_model.uml (revision 1625) +++ trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_model.uml (revision 1625) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_properties.txt =================================================================== --- trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_properties.txt (revision 1625) +++ trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_properties.txt (revision 1625) @@ -0,0 +1,5 @@ +/midas/rlus/query/xdw = rlus +/midas/rlus/update/xdw = rlus +/midas/rlus/update/cda2report = rlus +/midas/ixsmq/update/pocdpatient = ixsmq +/midas/ixsmq/query/pocdpatient = ixsmq