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 1929) +++ trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (revision 1931) @@ -28,8 +28,5 @@ import java.util.logging.Level; -//import static org.junit.Assert.*; - - - +import static org.junit.Assert.*; import org.eclipse.uml2.uml.Interaction; @@ -45,5 +42,4 @@ import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser; import de.ugoe.cs.autoquest.plugin.http.SOAPUtils; -import de.ugoe.cs.autoquest.plugin.http.eventcore.SOAPEventType; import de.ugoe.cs.autoquest.plugin.http.eventcore.SimpleSOAPEventType; import de.ugoe.cs.autoquest.testgeneration.RandomWalkGenerator; @@ -137,13 +133,60 @@ } - @Test(expected = java.lang.RuntimeException.class) + @Test public void testCreateUMLTransitionSequence_ITA_1() throws Exception { TestData testdata = ita_1; + /* + * Properties properties = loadProperties(testdata); //Collection> 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> umlSequences = new LinkedList<>(); + * + * // remove everything but transport from sequences for (List sequence : sequences) + * { for (Iterator eventIter = sequence.iterator(); eventIter.hasNext();) { Event + * event = eventIter.next(); if + * (!"TransportService".equals(SOAPUtils.getServiceNameFromEvent(event))) { + * eventIter.remove(); } } umlSequences.add(UMLUtils.createUMLTransitionSequence(sequence, + * stateMachine)); } + */ + + Model model = + ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile)); + + StateMachine stateMachine = + (StateMachine) model.getPackagedElement("StateMachineTransportService", true, + UMLPackage.Literals.STATE_MACHINE, true); + + List manuallyCreatedSequence = new LinkedList<>(); + manuallyCreatedSequence + .add(new Event(new SimpleSOAPEventType("transportInstructionRequest", + "TransportService", "Logistics_Environment", + null))); + manuallyCreatedSequence + .add(new Event(new SimpleSOAPEventType("transportInstructionConfirmationRequest", + "materialSupplierService", + "Logistics_Environment", null))); + + UMLUtils.createUMLTransitionSequence(manuallyCreatedSequence, stateMachine); + } + + @Test + public void testConvertStateMachineToUsageProfile__ITA_1() throws Exception { + TestData testdata = ita_1; + + assertTrue("test currently not working", false); + Properties properties = loadProperties(testdata); Collection> sequences = loadAndPreprocessUsageJournal(testdata, properties); Model model = ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile)); - StateMachine stateMachine = (StateMachine) model.getPackagedElement("StateMachineTransportService", true, @@ -156,6 +199,5 @@ for (Iterator eventIter = sequence.iterator(); eventIter.hasNext();) { Event event = eventIter.next(); - SOAPEventType eventType = (SOAPEventType) event.getType(); - if (!"TransportService".equals(eventType.getServiceName())) { + if (!"TransportService".equals(SOAPUtils.getServiceNameFromEvent(event))) { eventIter.remove(); } @@ -163,32 +205,6 @@ umlSequences.add(UMLUtils.createUMLTransitionSequence(sequence, stateMachine)); } - } - - @Test - public void testConvertStateMachineToUsageProfile__ITA_1() throws Exception { - TestData testdata = ita_1; - - Properties properties = loadProperties(testdata); - Collection> sequences = loadAndPreprocessUsageJournal(testdata, properties); - - Model model = - ModelUtils.loadModel(ClassLoader.getSystemResourceAsStream(testdata.dslModelFile)); - - // remove everything but transport from sequences - for (List sequence : sequences) { - for (Iterator eventIter = sequence.iterator(); eventIter.hasNext();) { - Event event = eventIter.next(); - SOAPEventType eventType = (SOAPEventType) event.getType(); - if (!"TransportService".equals(eventType.getServiceName())) { - eventIter.remove(); - } - } - } - - StateMachine stateMachine = - (StateMachine) model.getPackagedElement("StateMachineTransportService", true, - UMLPackage.Literals.STATE_MACHINE, true); - - UMLUtils.convertStateMachineToUsageProfile(sequences, stateMachine); + + UMLUtils.convertStateMachineToUsageProfile(umlSequences, stateMachine); ModelUtils.writeModelToFile(model, OUTPUT_DIR + "ita_v2_result.uml"); @@ -304,8 +320,9 @@ int[] lengths = new int[generatedSequences.size()]; for (List sequence : generatedSequences) { - interactions.add(UMLUtils.createInteractionFromEventSequence(sequence, model, - properties.getProperty("testcases.prefix") + - "_" + i, - properties.getProperty("test.context"))); + interactions.add(UMLUtils + .createInteractionFromEventSequence(sequence, model, + properties.getProperty("testcases.prefix") + + "_" + i, + properties.getProperty("test.context"))); lengths[i - 1] = sequence.size(); i++; @@ -385,5 +402,6 @@ } - private IStochasticProcess createUsageProfile(TestData testdata, Collection> sequences) + private IStochasticProcess createUsageProfile(TestData testdata, + Collection> sequences) throws Exception { Index: trunk/autoquest-plugin-uml-test/src/test/resources/deda_model.uml =================================================================== --- trunk/autoquest-plugin-uml-test/src/test/resources/deda_model.uml (revision 1929) +++ trunk/autoquest-plugin-uml-test/src/test/resources/deda_model.uml (revision 1931) @@ -15,4 +15,6 @@ + + @@ -69,5 +71,7 @@ - + + + @@ -1501,5 +1505,5 @@ - + @@ -1526,23 +1530,4 @@ - - - - - - - - - - - - - - - - - - - @@ -1587,57 +1572,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1693,23 +1625,4 @@ - - - - - - - - - - - - - - - - - - - @@ -1765,57 +1678,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1843,14 +1703,6 @@ - - - - - - - - Index: trunk/autoquest-plugin-uml-test/src/test/resources/ita_model.uml =================================================================== --- trunk/autoquest-plugin-uml-test/src/test/resources/ita_model.uml (revision 1929) +++ trunk/autoquest-plugin-uml-test/src/test/resources/ita_model.uml (revision 1931) @@ -10,23 +10,23 @@ - + - + - + - + - + - + - + @@ -38,40 +38,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,23 +79,23 @@ - + - + - + - + - + - + - + @@ -221,19 +221,118 @@ - - - - - - - - - + + + + + + + + If purchaseOrderConfirmation.accepted + + + + + If purchaseOrderConfirmation.accepted + + + + + + + while the sum of quantity from receiptNotificationInbound < quantity in instructionToReceive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -385,4 +484,9 @@ + + + + +