Changeset 1992 for trunk/autoquest-plugin-uml-test

Timestamp:

07/08/15 10:52:51 (9 years ago)

Author:

sherbold

Message:

• extended SOAPUtils with functions for sorting soap events and removing events that reference services that shall be ignored

File:

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

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

@@ -42 +42 @@
 import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser;
 import de.ugoe.cs.autoquest.plugin.http.SOAPUtils;
+import de.ugoe.cs.autoquest.plugin.http.SOAPUtils.SequenceOrder;
 import de.ugoe.cs.autoquest.plugin.http.eventcore.SimpleSOAPEventType;
 import de.ugoe.cs.autoquest.testgeneration.RandomWalkGenerator;
@@ -330 +331 @@
                                                         "_" + i,
                                                     properties.getProperty("test.context"),
-                                                    true));
+                                                    Boolean.parseBoolean(properties.getProperty("testcases.data.random", "false"))));
             lengths[i - 1] = sequence.size();
             i++;
@@ -383 +384 @@
         Collection<List<Event>> sequences = parser.getSequences();
 
-        // remove non SOAP events and convert to SimpleSOAPEventType
-        Collection<List<Event>> tmpSeqs = SOAPUtils.convertToSimpleSOAPEvent(sequences, true);
-        // normalize method names
-        Collection<List<Event>> simpleSOAPSequences = SOAPUtils.normalizeOperationNames(tmpSeqs, properties
+        sequences = SOAPUtils.removeNonSOAPEvents(sequences);
+        sequences = SOAPUtils.sortSequences(sequences, SequenceOrder.REQUEST);
+        sequences = SOAPUtils.convertToSimpleSOAPEvent(sequences, true);
+        sequences = SOAPUtils.normalizeOperationNames(sequences, properties
                     .getProperty("methodName.prefixToRemove"), properties
                     .getProperty("methodName.suffixToRemove"));
-
-        // remove calls to ignored services
-        Set<String> ignoredServices = new HashSet<>();
-        String ignoredServicesString = properties.getProperty("test.ignored.services");
-        if (ignoredServicesString != null) {
-            for (String service : ignoredServicesString.split(",")) {
-                ignoredServices.add(service.trim());
-            }
-        }
-
-        for (List<Event> sequence : simpleSOAPSequences) {
-            for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) {
-                Event event = eventIter.next();
-                SimpleSOAPEventType eventType = (SimpleSOAPEventType) event.getType();
-                if (ignoredServices.contains(eventType.getServiceName())) {
-                    eventIter.remove();
-                }
-                else if( ignoredServices.contains(eventType.getClientName())) {
-                    eventIter.remove();
-                }
-            }
-        }
-        return simpleSOAPSequences;
+        sequences = SOAPUtils.removeCallsToIgnoredServices(sequences, properties.getProperty("test.ignored.services"));
+        
+        return sequences;
     }