Changeset 2009 for trunk/autoquest-plugin-uml-test/src

Timestamp:

07/14/15 13:20:26 (9 years ago)

Author:

sherbold

Message:

• UMLInteractionCreator now caches instance specifications and reuses them is possible
• UMLUtil.createInteractionFromEventSequence now works with a collection of sequences instead of single sequence; this allows the enforcement of the instance specification caching
• updated tests to comply with new interface of UMLUtils

Location:

trunk/autoquest-plugin-uml-test/src/test

Files:

• java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (modified) (4 diffs)
• resources/ita_imported_properties.prop (modified) (1 diff)

trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java

@@ -306 +306 @@
 
         // create a test case for each observed sequence
-        int i = 0;
-        for (List<Event> sequence : sequences) {
-            UMLUtils.createInteractionFromEventSequence(sequence, model,
-                                                        properties.getProperty("testcases.prefix") +
-                                                            "_" + i,
-                                                        properties.getProperty("test.context"),
-                                                        false);
-            i++;
-        }
+        UMLUtils.createInteractionFromEventSequence(sequences, model,  properties.getProperty("testcases.prefix"), properties.getProperty("test.context"), false);
 
         ModelUtils.writeModelToFile(model, OUTPUT_DIR + testdata.testSuiteFile);
@@ -330 +322 @@
 
         int i = 1;
-        List<Interaction> interactions = new LinkedList<>();
+        List<Interaction> interactions = UMLUtils.createInteractionFromEventSequence(generatedSequences, model, properties.getProperty("testcases.prefix"), properties.getProperty("test.context"), Boolean.parseBoolean(properties.getProperty("testcases.data.random", "false")));
         int[] lengths = new int[generatedSequences.size()];
         for (List<Event> sequence : generatedSequences) {
-            interactions.add(UMLUtils
-                .createInteractionFromEventSequence(sequence, model,
-                                                    properties.getProperty("testcases.prefix") +
-                                                        "_" + i,
-                                                    properties.getProperty("test.context"),
-                                                    Boolean.parseBoolean(properties.getProperty("testcases.data.random", "false"))));
             lengths[i - 1] = sequence.size();
             i++;
@@ -357 +343 @@
         Collection<List<Event>> generatedSequences =
             createRandomSequences(usageProfile, properties);
-        int i = 1;
-        for (List<Event> sequence : generatedSequences) {
-            UMLUtils.createInteractionFromEventSequence(sequence, model,
-                                                        properties.getProperty("testcases.prefix") +
-                                                            "_" + i,
-                                                        properties.getProperty("test.context"),
-                                                        true);
-            i++;
-        }
-
+        UMLUtils.createInteractionFromEventSequence(generatedSequences, model, properties.getProperty("testcases.prefix"), properties.getProperty("test.context"), Boolean.parseBoolean(properties.getProperty("testcases.data.random", "false")));
+        
         UMLUtils.createScheduling(model, usageProfile, properties.getProperty("test.context"));
 
@@ -419 +397 @@
         int testCaseMinLength = Integer.parseInt(properties.getProperty("testcases.minlenth", "1"));
         int testCaseMaxLength =
-            Integer.parseInt(properties.getProperty("testcases.maxlenth", "100"));
+            Integer.parseInt(properties.getProperty("testcases.maxlength", "100"));
         int maxIter = numberOfTestCases * 100;
         RandomWalkGenerator testGenerator =
             new RandomWalkGenerator(numberOfTestCases, testCaseMinLength, testCaseMaxLength, true,
                                     maxIter);
-        return testGenerator.generateTestSuite(usageProfile);
+        return SOAPUtils.dropInvalidResponseRequestPairs(testGenerator.generateTestSuite(usageProfile));
     }
 

trunk/autoquest-plugin-uml-test/src/test/resources/ita_imported_properties.prop

@@ -23 +23 @@
 testcases.number = 10
 testcases.minlenght = 1
-testcases.maxlength = 10
+testcases.maxlength = 50
 testcases.data.random = false