Changeset 1988 for trunk/autoquest-plugin-http-test/src

Timestamp:

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

Author:

sherbold

Message:

• updated EqualSOAPDataMap: not a singleton anymore, now each event has a reference to the map. the map is created when the SOAPEvents are converted to SimpleSOAPEvents using the appropriate method from the SOAPUtils
• the logic for deciding if random SOAP requests are selected or the one of the event itself was changed within the SimpleSOAPEvents. Now methods for both are offered and the caller has to decide which method to choose
• the test case generation in the model utils now has a parameter to decide if random data or the data of the SimpleSOAPEvents is used

Location:

trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http

Files:

• SOAPUtilsTest.java (modified) (1 diff)
• eventcore/EqualSOAPDataMapTest.java (deleted)

trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/SOAPUtilsTest.java

@@ -46 +46 @@
         parser.parseFile(new File(ClassLoader.getSystemResource("testParseFile_3_logfile.log")
             .getFile()));
-        Collection<List<Event>> events = parser.getSequences();
+        Collection<List<Event>> sequences = parser.getSequences();
 
-        assertNotNull(events);
-        assertEquals(1, events.size());
+        assertNotNull(sequences);
+        assertFalse(sequences.isEmpty());
 
-        List<Event> sequence = events.iterator().next();
+        Collection<List<Event>> newSequences = SOAPUtils.convertToSimpleSOAPEvent(sequences, false);
+        
+        assertNotNull(newSequences);
+        assertEquals(sequences.size(), newSequences.size());
 
-        List<Event> newSequence = SOAPUtils.convertToSimpleSOAPEvent(sequence, false);
-
-        assertNotNull(newSequence);
-        assertEquals(sequence.size(), newSequence.size());
-
-        Iterator<Event> oldSeqIter = sequence.iterator();
-        Iterator<Event> newSeqIter = newSequence.iterator();
-
-        while (oldSeqIter.hasNext()) {
-            Event oldEvent = oldSeqIter.next();
-            Event newEvent = newSeqIter.next();
-
-            if (oldEvent.getType() instanceof SOAPEventType) {
-                assertTrue(newEvent.getType() instanceof SimpleSOAPEventType);
-                SOAPEventType oldEventType = (SOAPEventType) oldEvent.getType();
-                SimpleSOAPEventType newEventType = (SimpleSOAPEventType) newEvent.getType();
-                assertEquals(oldEventType.getCalledMethod(), newEventType.getCalledMethod());
-                assertEquals(oldEventType.getServiceName(), newEventType.getServiceName());
-                assertEquals(oldEventType.getClientName(), newEventType.getClientName());
-                assertNull(newEvent.getTarget());
-            }
-            else {
-                assertSame(oldEvent, newEvent);
+        // compare sequences
+        Iterator<List<Event>> oldIter = sequences.iterator();
+        Iterator<List<Event>> newIter = newSequences.iterator();
+        
+        while( oldIter.hasNext() ) {
+            Iterator<Event> oldSeqIter = oldIter.next().iterator();
+            Iterator<Event> newSeqIter = newIter.next().iterator();
+    
+            while (oldSeqIter.hasNext()) {
+                Event oldEvent = oldSeqIter.next();
+                Event newEvent = newSeqIter.next();
+    
+                if (oldEvent.getType() instanceof SOAPEventType) {
+                    assertTrue(newEvent.getType() instanceof SimpleSOAPEventType);
+                    SOAPEventType oldEventType = (SOAPEventType) oldEvent.getType();
+                    SimpleSOAPEventType newEventType = (SimpleSOAPEventType) newEvent.getType();
+                    assertEquals(oldEventType.getCalledMethod(), newEventType.getCalledMethod());
+                    assertEquals(oldEventType.getServiceName(), newEventType.getServiceName());
+                    assertEquals(oldEventType.getClientName(), newEventType.getClientName());
+                    assertNull(newEvent.getTarget());
+                }
+                else {
+                    assertSame(oldEvent, newEvent);
+                }
             }
         }