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

Timestamp:

07/07/15 08:36:39 (9 years ago)

Author:

sherbold

Message:

*updated tests

File:

• trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java (modified) (4 diffs)

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

@@ -303 +303 @@
                                                         properties.getProperty("testcases.prefix") +
                                                             "_" + i,
-                                                        properties.getProperty("test.context"));
+                                                        properties.getProperty("test.context"),
+                                                        false);
             i++;
         }
@@ -328 +329 @@
                                                     properties.getProperty("testcases.prefix") +
                                                         "_" + i,
-                                                    properties.getProperty("test.context")));
+                                                    properties.getProperty("test.context"),
+                                                    true));
             lengths[i - 1] = sequence.size();
             i++;
@@ -352 +354 @@
                                                         properties.getProperty("testcases.prefix") +
                                                             "_" + i,
-                                                        properties.getProperty("test.context"));
+                                                        properties.getProperty("test.context"),
+                                                        true);
             i++;
         }
@@ -381 +384 @@
 
         // remove non SOAP events and convert to SimpleSOAPEventType
-        Collection<List<Event>> simpleSOAPSequences = new LinkedList<>();
-        for (List<Event> sequence : sequences) {
-            List<Event> simpleSOAPSequence = SOAPUtils.convertToSimpleSOAPEvent(sequence, true);
-            List<Event> simpleSOAPSequenceWithNormalizedMethodNames =
-                SOAPUtils.normalizeOperationNames(simpleSOAPSequence, properties
+        Collection<List<Event>> tmpSeqs = SOAPUtils.convertToSimpleSOAPEvent(sequences, true);
+        // normalize method names
+        Collection<List<Event>> simpleSOAPSequences = SOAPUtils.normalizeOperationNames(tmpSeqs, properties
                     .getProperty("methodName.prefixToRemove"), properties
                     .getProperty("methodName.suffixToRemove"));
-            simpleSOAPSequences.add(simpleSOAPSequenceWithNormalizedMethodNames);
-        }
-
-        // remove calls to ingored services
+
+        // remove calls to ignored services
         Set<String> ignoredServices = new HashSet<>();
         String ignoredServicesString = properties.getProperty("test.ignored.services");