Changeset 1599 for trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin

Timestamp:

07/11/14 11:58:34 (10 years ago)

Author:

pharms

Message:

• equals check for SOAP events

Location:

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

Files:

• HTTPLogParser.java (modified) (1 diff)
• commands/CMDparseDirHTTP.java (modified) (2 diffs)
• eventcore/HTTPEventType.java (modified) (2 diffs)
• eventcore/SOAPEventType.java (modified) (3 diffs)

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

@@ -104 +104 @@
         
         try {
-                        parseFile(new FileInputStream(file));
-                } catch (FileNotFoundException e) {
-                        Console.printerr("Error parsing file + " + file.getName());
+            parseFile(new FileInputStream(file));
+        }
+        catch (FileNotFoundException e) {
+            Console.printerr("Error parsing file + " + file.getName());
             Console.logException(e);
             return;
-                }
+        }
     }
     

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

@@ -71 +71 @@
 
         Collection<List<Event>> sequences = parser.getSequences();
-
+        
         if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
             CommandHelpers.dataOverwritten(sequencesName);
@@ -104 +104 @@
             }
             catch (Exception e) {
-                Console.printerrln("Could not parse " + source + ": " + e.getMessage());
+                Console.printerrln("Could not parse " + source + ": " + e);
             }
         }

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

@@ -136 +136 @@
             HTTPEventType other = (HTTPEventType) obj;
             
+            if (!other.getClass().isAssignableFrom(this.getClass())) {
+                return false;
+            }
+            
+            if (exchange == null) {
+                return other.exchange == null;
+            }
+            else if (other.exchange == null) {
+                return false;
+            }
+            
             HttpRequest request1 = exchange.getRequest();
             HttpRequest request2 = other.exchange.getRequest();
             
-            return (HTTPUtils.equals(exchange.getSender(), other.exchange.getSender()) &&
-                    HTTPUtils.equals(exchange.getReceiver(), other.exchange.getReceiver()) &&
+            // do not compare the sender, as this may change
+            return (HTTPUtils.equals(exchange.getReceiver(), other.exchange.getReceiver()) &&
                     HTTPUtils.equals(request1.getMethod(), request2.getMethod()) &&
                     HTTPUtils.equals(request1.getProtocol(), request2.getProtocol()) &&
@@ -155 +166 @@
     @Override
     public int hashCode() {
-        return
-            exchange.getRequest().getMethod().hashCode() +
-            exchange.getRequest().getProtocol().hashCode() +
-            exchange.getRequest().getUrl().hashCode();
+        if (exchange != null) {
+            return
+                exchange.getRequest().getMethod().hashCode() +
+                exchange.getRequest().getProtocol().hashCode() +
+                exchange.getRequest().getUrl().hashCode();
+        }
+        else {
+            return 0;
+        }
     }
 

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

@@ -36 +36 @@
  * @author Patrick Harms
  */
-public class SOAPEventType extends HTTPEventType {
+public final class SOAPEventType extends HTTPEventType {
 
     /**  */
@@ -190 +190 @@
         }
         else if (obj instanceof SOAPEventType) {
+            if (!obj.getClass().isAssignableFrom(this.getClass())) {
+                return false;
+            }
+            
             return
                 super.equals(obj) &&
@@ -204 +208 @@
     @Override
     public int hashCode() {
-        return super.hashCode() + calledMethod.hashCode();
+        if (calledMethod != null) {
+            return super.hashCode() + calledMethod.hashCode();
+        }
+        else {
+            return super.hashCode();
+        }
     }