+ * Tests for the HTTPUtils + *
+ * + * @author Steffen Herbold + */ +public class HTTPUtilsTest { + + @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- * converts an address to a simple string containing either host or ip and the port number - * if any. + * converts an address to a simple string containing either host or ip and the port number if + * any. *
* - * @param address the address to convert + * @param address + * the address to convert * * @return either "host:port" or "ip:port" or "host" or "ip" or "port" or null @@ -65,11 +72,12 @@ /** *- * compares two addresses and returns true, if they are equal and false else. The addresses - * are equal, if either the ip-addresses and the ports match or the host names and the - * ports match. + * compares two addresses and returns true, if they are equal and false else. The addresses are + * equal, if either the ip-addresses and the ports match or the host names and the ports match. *
- * - * @param address1 the first address to compare - * @param address2 the second address to compare + * + * @param address1 + * the first address to compare + * @param address2 + * the second address to compare * * @return as described @@ -82,9 +90,9 @@ return false; } - + if (!equals(address1.getPort(), address2.getPort())) { return false; } - + if (address1.getIp() != null) { return equals(address1.getIp(), address2.getIp()); @@ -94,18 +102,20 @@ } } - + /** *- * convenience method to compare to objects. They are considered equal if they both are null, - * or if their equals method returns true. + * convenience method to compare to objects. They are considered equal if they both are null, or + * if their equals method returns true. *
- * - * @param object1 the first object to compare - * @param object2 the second object to compare + * + * @param object1 + * the first object to compare + * @param object2 + * the second object to compare * * @return as described */ public static+ * Replaces events with a {@link SOAPEventType} with new events of {@link SimpleSOAPEventType} + * and no target. + *
+ * + * @param sequence + * sequence where the events are replaced + * @return sequence with {@link SimpleSOAPEventType}s instead of {@link SOAPEventType}s + */ + public static List* prevent instantiation *
*/ - private HTTPUtils() { } - + private HTTPUtils() {} + } Index: trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java =================================================================== --- trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java (revision 1634) +++ trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java (revision 1635) @@ -47,5 +47,5 @@ * */ - transient private SOAPMessage soapRequest; + transient private final SOAPMessage soapRequest; /** @@ -54,5 +54,5 @@ * */ - transient private SOAPMessage soapResponse; + transient private final SOAPMessage soapResponse; /** @@ -61,11 +61,12 @@ * */ - private String calledMethod; + private final String calledMethod; /** ** the name of the service; this is either the path or, if a path map is available - */ - private String serviceName; + *
+ */ + private final String serviceName; /** @@ -74,5 +75,5 @@ * */ - private String name; + private final String name; /** @@ -227,5 +228,6 @@ return super.equals(obj) && - HTTPUtils.equals(calledMethod, ((SOAPEventType) obj).calledMethod); + HTTPUtils.equals(calledMethod, ((SOAPEventType) obj).calledMethod) && + HTTPUtils.equals(serviceName, ((SOAPEventType) obj).serviceName); } else { @@ -239,10 +241,12 @@ @Override public int hashCode() { + int hashCode = super.hashCode(); if (calledMethod != null) { - return super.hashCode() + calledMethod.hashCode(); - } - else { - return super.hashCode(); - } + hashCode += calledMethod.hashCode(); + } + if( serviceName != null ) { + hashCode += serviceName.hashCode(); + } + return hashCode; } Index: trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java =================================================================== --- trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java (revision 1635) +++ trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java (revision 1635) @@ -0,0 +1,131 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.plugin.http.eventcore; + +import de.ugoe.cs.autoquest.eventcore.IEventType; +import de.ugoe.cs.autoquest.plugin.http.HTTPUtils; + +/** + *+ * A simplified SOAP event type that only contains the name of the called method and the name of the + * service. + *
+ * + * @author Steffen Herbold + */ +public class SimpleSOAPEventType implements IEventType { + + /** */ + private static final long serialVersionUID = 1L; + + /** + *+ * the SOAP method called in this request + *
+ */ + private final String calledMethod; + + /** + *+ * the name of the service; this is either the path or, if a path map is available + *
+ */ + private final String serviceName; + + /** + *+ * Constructor. Creates a new SimpleSOAPEventType. + *
+ * + */ + public SimpleSOAPEventType(String calledMethod, String serviceName) { + if (calledMethod == null) { + throw new IllegalArgumentException("called method must not be null"); + } + if (serviceName == null) { + throw new IllegalArgumentException("serviceName must not be null"); + } + this.calledMethod = calledMethod; + this.serviceName = serviceName; + } + + /** + *+ * the SOAP method called in this request + *
+ * + * @return the SOAP method called in this request + */ + public String getCalledMethod() { + return calledMethod; + } + + /** + *+ * the name of the service called in this request + *
+ * + * @return the name of the service called in this request + */ + public String getServiceName() { + return serviceName; + } + + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.autoquest.eventcore.IEventType#getName() + */ + @Override + public String getName() { + return "(" + serviceName + ", " + calledMethod + ")"; + } + + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + else if (obj instanceof SimpleSOAPEventType) { + return HTTPUtils.equals(calledMethod, ((SimpleSOAPEventType) obj).getCalledMethod()) && + HTTPUtils.equals(serviceName, ((SimpleSOAPEventType) obj).getServiceName()); + } + else { + return false; + } + } + + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType#hashCode() + */ + @Override + public int hashCode() { + int hashCode = super.hashCode(); + if (calledMethod != null) { + hashCode += calledMethod.hashCode(); + } + if (serviceName != null) { + hashCode += serviceName.hashCode(); + } + return hashCode; + } +}