Index: trunk/autoquest-plugin-uml-test/.classpath
===================================================================
--- trunk/autoquest-plugin-uml-test/.classpath (revision 1752)
+++ trunk/autoquest-plugin-uml-test/.classpath (revision 1759)
@@ -7,5 +7,5 @@
-
+
Index: trunk/autoquest-plugin-uml-test/pom.xml
===================================================================
--- trunk/autoquest-plugin-uml-test/pom.xml (revision 1752)
+++ trunk/autoquest-plugin-uml-test/pom.xml (revision 1759)
@@ -41,5 +41,5 @@
${project.parent.version}
-
+
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 1752)
+++ trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (revision 1759)
@@ -16,27 +16,10 @@
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.Random;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.Model;
@@ -44,9 +27,8 @@
import org.eclipse.uml2.uml.Transition;
import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.resource.UMLResource;
-import org.eclipse.uml2.uml.resources.util.UMLResourcesUtil;
import org.junit.After;
import org.junit.Test;
+import de.fraunhofer.fokus.testing.ModelUtils;
import de.ugoe.cs.autoquest.eventcore.Event;
import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser;
@@ -56,5 +38,4 @@
import de.ugoe.cs.autoquest.testgeneration.RandomWalkGenerator;
import de.ugoe.cs.autoquest.usageprofiles.FirstOrderMarkovModel;
-import eu.midas.dsl.validation.util.ConstraintValidator;
/**
@@ -85,5 +66,5 @@
Collection> httpSequences = parser.getSequences();
Model model =
- loadModelFromInputStream(ClassLoader
+ ModelUtils.loadModel(ClassLoader
.getSystemResourceAsStream("createSequence_1_model.uml"));
@@ -118,5 +99,5 @@
Collection> httpSequences = parser.getSequences();
Model model =
- loadModelFromInputStream(ClassLoader
+ ModelUtils.loadModel(ClassLoader
.getSystemResourceAsStream("createSequence_1_model.uml"));
@@ -151,5 +132,5 @@
UMLUtils.convertStateMachineToUsageProfile(umlSequences, stateMachine);
- writeModelToFile(model, OUTPUT_DIR + "convertStateMachineToUsageProfile_1.uml");
+ ModelUtils.writeModelToFile(model, OUTPUT_DIR + "convertStateMachineToUsageProfile_1.uml");
}
@@ -166,6 +147,7 @@
.getFile()));
Collection> httpSequences = parser.getSequences();
- Model model =
- loadModelFromInputStream(ClassLoader
+
+ Model model =
+ ModelUtils.loadModel(ClassLoader
.getSystemResourceAsStream("testCreateInteractionFromEventSequence_1_model.uml"));
@@ -181,19 +163,5 @@
}
- 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"));
+ ModelUtils.writeModelToFile(model, OUTPUT_DIR + "testCreateInteractionFromEventSequence_1_result.uml");
}
@@ -207,6 +175,7 @@
.getSystemResource("testCalculateUsageScore_1_usagedata.log").getFile()));
Collection> httpSequences = parser.getSequences();
- Model model =
- loadModelFromInputStream(ClassLoader
+
+ Model model =
+ ModelUtils.loadModel(ClassLoader
.getSystemResourceAsStream("testCalculateUsageScore_1_model.uml"));
@@ -245,63 +214,4 @@
}
- 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) {
- @Override
- public boolean useUUIDs() {
- return true;
- }
- };
- }
- });
-
- Resource resource = resourceSet.createResource(URI.createURI("binresource"));
-
- resource.getContents().add(model);
- FileOutputStream fos;
- File file = new File(filename);
- if (file.getParent() != null) {
- file.getParentFile().mkdirs();
- }
- fos = new FileOutputStream(file);
- resource.save(fos, null);
- }
-
- private static Model loadModelFromInputStream(InputStream inputStream) {
- ResourceSet resourceSet = new ResourceSetImpl();
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
- .put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
- resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
- resourceSet.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
- .put(Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
- Map uriMap = resourceSet.getURIConverter().getURIMap();
-
- UMLResourcesUtil.init(resourceSet);
-
- uriMap.put(URI.createURI("pathmap://Papyrus.profile.uml"),
- URI.createURI("file:/D:/.../Papyrus.profile.uml/"));
-
- EPackage.Registry.INSTANCE.put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
-
- Resource resource = new XMIResourceImpl();
-
- try {
- // resource.load(inputStream, options);
- resource.load(inputStream, null);
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return (Model) EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.MODEL);
- }
-
private void deleteFiles(File file) {
if (file.exists()) {
Index: trunk/autoquest-plugin-uml-test/src/test/resources/testCalculateUsageScore_1_model.uml
===================================================================
--- trunk/autoquest-plugin-uml-test/src/test/resources/testCalculateUsageScore_1_model.uml (revision 1752)
+++ trunk/autoquest-plugin-uml-test/src/test/resources/testCalculateUsageScore_1_model.uml (revision 1759)
@@ -1,47 +1,550 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 1752)
+++ trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_model.uml (revision 1759)
@@ -1,87 +1,96 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+