Changeset 2234 for trunk

Timestamp:

12/08/17 09:42:38 (7 years ago)

Author:

pharms

Message:

 

Location:

trunk

Files:

• autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/HTTPLogParserTest.java (modified) (1 diff)
• autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/SOAPUtils.java (modified) (1 diff)
• autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDcorrectDirOldJFC.java (modified) (1 diff)
• autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeChecker.java (modified) (1 diff)

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

@@ -265 +265 @@
                 File[] children = file.listFiles();
                 if (children != null) {
-                    for (File child : file.listFiles()) {
+                    for (File child : children) {
                         deleteFiles(child);
                     }

trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/SOAPUtils.java

@@ -833 +833 @@
             return true;
         }
-        if ((request != null && response == null) || (request == null && response != null)) {
+        else if ((request != null && response == null) || (request == null && response != null)) {
             return false;
         }
-        return request.getCallType().equals(CallType.REQUEST) &&
-            response.getCallType().equals(CallType.RESPONSE) &&
-            HTTPUtils.equals(request.getCalledMethod(), response.getCalledMethod()) &&
-            HTTPUtils.equals(request.getServiceName(), response.getServiceName()) &&
-            HTTPUtils.equals(request.getClientName(), response.getClientName());
+        else {
+            return request.getCallType().equals(CallType.REQUEST) &&
+                response.getCallType().equals(CallType.RESPONSE) &&
+                HTTPUtils.equals(request.getCalledMethod(), response.getCalledMethod()) &&
+                HTTPUtils.equals(request.getServiceName(), response.getServiceName()) &&
+                HTTPUtils.equals(request.getClientName(), response.getClientName());
+        }
     }
 

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDcorrectDirOldJFC.java

@@ -72 +72 @@
         
         if (children != null) {
-            for (String filename : folder.list()) {
+            for (String filename : children) {
                 String source = absolutPath + "/" + filename;
                 String dest = absolutDestPath + "/" + filename;

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeChecker.java

@@ -134 +134 @@
                          expected.getClass(), checked.getClass());
             
-            if ((expected != null) && (expected.size() > 0)) {
+            if (expected.size() > 0) {
                 assertNotNull(expected.toString() + ": children not there", checked);
                 assertEquals(expected.toString() + ": different number of children",