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

Timestamp:

07/06/15 12:08:37 (9 years ago)

Author:

sherbold

Message:

• code formatting

Location:

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

Files:

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

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

@@ -38 +38 @@
  */
 public class SOAPUtilsTest {
-    
+
     @Test
     public void testConvertToSimpleSOAPEvent_1() throws Exception {
         HTTPLogParser parser =
-                new HTTPLogParser(new File(ClassLoader
-                    .getSystemResource("testParseFile_3_properties.txt").getFile()));
-            parser.parseFile(new File(ClassLoader.getSystemResource("testParseFile_3_logfile.log")
-                .getFile()));
-            Collection<List<Event>> events = parser.getSequences();
+            new HTTPLogParser(new File(ClassLoader
+                .getSystemResource("testParseFile_3_properties.txt").getFile()));
+        parser.parseFile(new File(ClassLoader.getSystemResource("testParseFile_3_logfile.log")
+            .getFile()));
+        Collection<List<Event>> events = parser.getSequences();
 
-            assertNotNull(events);
-            assertEquals(1, events.size());
+        assertNotNull(events);
+        assertEquals(1, events.size());
 
-            List<Event> sequence = events.iterator().next();
-            
-            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);
-                }
+        List<Event> sequence = events.iterator().next();
+
+        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);
+            }
+        }
+
     }
 

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

@@ -52 +52 @@
         parser.parseFile(new File(ClassLoader.getSystemResource("testParseFile_3_logfile.log")
             .getFile()));
-        for( List<Event> sequence : parser.getSequences() ) {
+        for (List<Event> sequence : parser.getSequences()) {
             SOAPUtils.convertToSimpleSOAPEvent(sequence, true);
         }
-        
-        Field privateStringField = EqualSOAPDataMap.class.
-                    getDeclaredField("soapRequestBodies");
+
+        Field privateStringField = EqualSOAPDataMap.class.getDeclaredField("soapRequestBodies");
 
         privateStringField.setAccessible(true);
 
-        Map<SimpleSOAPEventType, ListOrderedSet<String>> internalMapExpected = (Map<SimpleSOAPEventType, ListOrderedSet<String>>) privateStringField.get(EqualSOAPDataMap.getInstance());
-        
+        Map<SimpleSOAPEventType, ListOrderedSet<String>> internalMapExpected =
+            (Map<SimpleSOAPEventType, ListOrderedSet<String>>) privateStringField
+                .get(EqualSOAPDataMap.getInstance());
+
         // serialize
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -70 +71 @@
 
         EqualSOAPDataMap.getInstance().reset();
-        
+
         // deserialize
         byte[] pickled = out.toByteArray();
@@ -77 +78 @@
         ois.readObject();
         ois.close();
-        
-        Map<SimpleSOAPEventType, ListOrderedSet<String>> internalMapResult = (Map<SimpleSOAPEventType, ListOrderedSet<String>>) privateStringField.get(EqualSOAPDataMap.getInstance());
-        
+
+        Map<SimpleSOAPEventType, ListOrderedSet<String>> internalMapResult =
+            (Map<SimpleSOAPEventType, ListOrderedSet<String>>) privateStringField
+                .get(EqualSOAPDataMap.getInstance());
+
         assertNotSame(internalMapExpected, internalMapResult);
         assertEquals(internalMapExpected, internalMapResult);