Index: /trunk/autoquest-plugin-uml-test/pom.xml
===================================================================
--- /trunk/autoquest-plugin-uml-test/pom.xml (revision 1751)
+++ /trunk/autoquest-plugin-uml-test/pom.xml (revision 1752)
@@ -18,4 +18,12 @@
scm:svn:${autoquest-scm-trunk-dir}/${project.artifactId}
+
+
+
+ autoquest-thirdparty-repo
+ https://trex.informatik.uni-goettingen.de/nexus/content/repositories/thirdparty
+
+
+
autoquest-plugin-uml
@@ -33,4 +41,86 @@
${project.parent.version}
+
+
+ org.eclipse.emf
+ org.eclipse.emf.common
+ 2.9.2
+
+
+ org.eclipse.emf
+ org.eclipse.emf.ecore
+ 2.9.2
+
+
+ org.eclipse.emf
+ org.eclipse.emf.ecore.xmi
+ 2.9.1
+
+
+ org.eclipse.emf
+ org.eclipse.emf.mapping.ecore2xml
+ 2.7.0
+
+
+
+ org.eclipse.uml2
+ org.eclipse.uml2.common
+ 1.8.2
+
+
+ org.eclipse.uml2
+ org.eclipse.uml2.types
+ 1.1.0
+
+
+ org.eclipse.uml2
+ org.eclipse.uml2.uml
+ 4.1.2
+
+
+ org.eclipse.uml2
+ org.eclipse.uml2.uml.profile.l2
+ 1.1.0
+
+
+ org.eclipse.uml2
+ org.eclipse.uml2.uml.profile.l3
+ 1.1.0
+
+
+ org.eclipse.uml2
+ org.eclipse.uml2.uml.resources
+ 4.1.0
+
+
+ org.eclipse.emf
+ org.eclipse.emf.validation
+ 1.7.0
+
+
+ org.eclipse.equinox
+ org.eclipse.equinox.common
+ 3.6.2
+
+
+ org.eclipse.equinox
+ org.eclipse.equinox.registry
+ 3.5.3
+
+
+ org.eclipse.core
+ org.eclipse.core.expressions
+ 3.4.5
+
+
+ org.eclipse.osgi
+ org.eclipse.osgi
+ 3.9.1
+
+
+ eu.midas_project
+ ConstraintValidator
+ 0.2
+
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 1751)
+++ /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (revision 1752)
@@ -27,4 +27,5 @@
import java.util.Random;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EPackage;
@@ -55,4 +56,5 @@
import de.ugoe.cs.autoquest.testgeneration.RandomWalkGenerator;
import de.ugoe.cs.autoquest.usageprofiles.FirstOrderMarkovModel;
+import eu.midas.dsl.validation.util.ConstraintValidator;
/**
@@ -178,6 +180,20 @@
UMLUtils.createInteractionFromEventSequence(httpSequence, model, "testSequence");
}
+
+ ConstraintValidator validator = new ConstraintValidator();
+ IStatus validationStatus = validator.validate(model);
+ if (validationStatus.getSeverity() == IStatus.OK) {
+ System.out.println("success");
+ }
+ else {
+ System.out.println("Errors during the model validation: ");
+ for (IStatus status : validationStatus.getChildren()) {
+ System.out.println("\t" + status.getMessage());
+ }
+ }
+
writeModelToFile(model, OUTPUT_DIR + "testCreateInteractionFromEventSequence_1_result.uml");
- loadModelFromInputStream(new FileInputStream(OUTPUT_DIR + "testCreateInteractionFromEventSequence_1_result.uml"));
+ loadModelFromInputStream(new FileInputStream(OUTPUT_DIR +
+ "testCreateInteractionFromEventSequence_1_result.uml"));
}
@@ -225,5 +241,5 @@
UMLPackage.Literals.INTERACTION, true);
double usageScore = UMLUtils.calculateUsageScore(interaction, usageProfile);
- System.out.format("usage score %02d: %.2f \t %d\n",j+1, usageScore, lengths[j]);
+ System.out.format("usage score %02d: %.2f \t %d\n", j + 1, usageScore, lengths[j]);
}
}
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 1751)
+++ /trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_model.uml (revision 1752)
@@ -1,47 +1,87 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
Index: /trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java
===================================================================
--- /trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java (revision 1751)
+++ /trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java (revision 1752)
@@ -24,15 +24,19 @@
import org.eclipse.emf.common.util.EList;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.InteractionFragment;
+import org.eclipse.uml2.uml.Interface;
import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.Message;
import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
+import org.eclipse.uml2.uml.MessageSort;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Port;
import org.eclipse.uml2.uml.Region;
import org.eclipse.uml2.uml.StateMachine;
@@ -258,10 +262,11 @@
String interactionName)
{
- Map classMap = new HashMap<>();
+ Map interfaceMap = new HashMap<>();
+ Map portMap = new HashMap<>();
EList elements = model.getOwnedElements();
for (Element element : elements) {
- if (element instanceof Class) {
- classMap.put(((Class) element).getName(), (Class) element);
+ if (element instanceof Interface) {
+ interfaceMap.put(((Interface) element).getName(), (Interface) element);
}
}
@@ -272,5 +277,11 @@
Lifeline userLifeline = interaction.createLifeline("user");
-
+
+ Component testContext = (Component) model.getPackagedElement("TestContext", true, UMLPackage.Literals.COMPONENT, true);
+ userLifeline.setRepresents(testContext.getAttribute("user", null));
+
+ Component userComponent = (Component) model.getPackagedElement("User", true, UMLPackage.Literals.COMPONENT, true);
+ Port userPort = (Port) userComponent.getAttribute("p_user_rlus", null);
+
int i = 0;
for (Event event : sequence) {
@@ -279,8 +290,8 @@
String methodName = getCalledMethodFromEvent(event);
- Class targetClass = classMap.get(serviceName);
- if (targetClass == null) {
+ Interface targetInterface = interfaceMap.get(serviceName);
+ if (targetInterface == null) {
throw new RuntimeException(
- "Could not find class in the UML model that belong to the service: " +
+ "Could not find interface in the UML model that belong to the service: " +
serviceName);
}
@@ -289,11 +300,10 @@
if (targetLifeline == null) {
targetLifeline = interaction.createLifeline(serviceName);
- Association association =
- (Association) model.getPackagedElement("user_" + serviceName, true,
- UMLPackage.Literals.ASSOCIATION,
- true);
- targetLifeline
- .setRepresents(association.getMemberEnd(serviceName,
- classMap.get(serviceName)));
+
+
+ targetLifeline.setRepresents(testContext.getAttribute(serviceName+"_property", null));
+
+ Component component = (Component) model.getPackagedElement(serviceName, true, UMLPackage.Literals.COMPONENT, true);
+ portMap.put(serviceName, (Port) component.getAttribute("p_" + serviceName, null));
}
MessageOccurrenceSpecification sendFragment =
@@ -310,8 +320,25 @@
Message message = interaction.createMessage(methodName);
- message.setSignature(getOperationFromName(targetClass.getOperations(), methodName));
+ if( getOperationFromName(targetInterface.getOperations(), methodName)==null ) {
+ System.out.println("operation not found: " + methodName);
+ }
+ message.setSignature(getOperationFromName(targetInterface.getOperations(), methodName));
+ message.setMessageSort(MessageSort.ASYNCH_CALL_LITERAL);
message.setSendEvent(sendFragment);
message.setReceiveEvent(recvFragment);
-
+
+ EList sourceEnds = userPort.getEnds();
+ EList targetEnds = portMap.get(serviceName).getEnds();
+
+ for( ConnectorEnd sourceEnd : sourceEnds ) {
+ Connector sourceConnector = (Connector) sourceEnd.eContainer();
+ for( ConnectorEnd targetEnd : targetEnds ) {
+ Connector targetConnector = (Connector) targetEnd.eContainer();
+ if( targetConnector==sourceConnector ) {
+ message.setConnector(targetConnector);
+ }
+ }
+ }
+
sendFragment.setMessage(message);
recvFragment.setMessage(message);