Index: /trunk/autoquest-httpmonitor-test/.classpath =================================================================== --- /trunk/autoquest-httpmonitor-test/.classpath (revision 1389) +++ /trunk/autoquest-httpmonitor-test/.classpath (revision 1390) @@ -2,4 +2,17 @@ + + + + + + + + + + + + + Index: /trunk/autoquest-httpmonitor-test/pom.xml =================================================================== --- /trunk/autoquest-httpmonitor-test/pom.xml (revision 1389) +++ /trunk/autoquest-httpmonitor-test/pom.xml (revision 1390) @@ -19,6 +19,61 @@ autoquest-httpmonitor + 7.0.34 + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + test + + + org.apache.tomcat.embed + tomcat-embed-logging-juli + ${tomcat.version} + test + + + org.apache.tomcat.embed + tomcat-embed-jasper + ${tomcat.version} + test + + + org.apache.tomcat + tomcat-jasper + ${tomcat.version} + test + + + org.apache.tomcat + tomcat-jasper-el + ${tomcat.version} + test + + + org.apache.tomcat + tomcat-jsp-api + ${tomcat.version} + test + + + org.apache.cxf + cxf-rt-frontend-jaxws + 2.7.7 + test + + + org.springframework + spring-context + 3.1.4.RELEASE + test + + + org.springframework.security + spring-security-web + 3.1.4.RELEASE + test + org.apache.httpcomponents @@ -27,4 +82,87 @@ test + + org.eclipse.jetty + jetty-webapp + 9.1.0.M0 + test + + + + + org.apache.cxf + cxf-codegen-plugin + 2.7.7 + + + generate-sources + generate-sources + + + + ${basedir}/src/main/resources/DummyService.wsdl + classpath:DummyService.wsdl + + -impl + + + + + + wsdl2java + + + + + + maven-war-plugin + 2.1 + + + dummyServiceWarGeneration + process-test-classes + + ${basedir}/src/main/webapp/WEB-INF/web.xml + ${project.build.directory}/test/tomcat/webapp + dummyService + + + war + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-war-plugin + [2.1,) + + war + + + + + + + + + + + + + Index: /trunk/autoquest-httpmonitor-test/src/main/java/de/ugoe/cs/autoquest/httpmonitor/DummyServiceImpl.java =================================================================== --- /trunk/autoquest-httpmonitor-test/src/main/java/de/ugoe/cs/autoquest/httpmonitor/DummyServiceImpl.java (revision 1390) +++ /trunk/autoquest-httpmonitor-test/src/main/java/de/ugoe/cs/autoquest/httpmonitor/DummyServiceImpl.java (revision 1390) @@ -0,0 +1,51 @@ +// 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.httpmonitor; + +import dummyservice.DummyServicePortTypeImpl; +import dummyservice.SynStatus; +import dummyservice.UserInfo; +import dummyservice.VerifyUserInMsgType; +import dummyservice.VerifyUserOutMsgType; + +/** + *

+ * Dummy implementation of a SOAP service for testing + *

+ * + * @author Patrick Harms + */ +public class DummyServiceImpl extends DummyServicePortTypeImpl { + + /* (non-Javadoc) + * @see eu.midas_project.enduser.api.identityandauthenticationservice_wsdl.IdentityAndAuthPortTypeImpl#verifyUser(eu.midas_project.enduser.api.identityandauthenticationtypes.VerifyUserInMsgType) + */ + @Override + public VerifyUserOutMsgType verifyUser(VerifyUserInMsgType content) { + System.out.println("DummyServiceImpl.verifyUser"); + + VerifyUserOutMsgType result = new VerifyUserOutMsgType(); + result.setMsg("OK"); + result.setStatus(SynStatus.DONE); + UserInfo userInfo = new UserInfo(); + userInfo.setUsername("dummyUser"); + userInfo.setIsAdmin(true); + userInfo.setFullname("Dummy User"); + userInfo.setEmail("dummy.user@midas_project.eu"); + result.setUserInfo(userInfo); + return result; + } + +} Index: /trunk/autoquest-httpmonitor-test/src/main/resources/DummyService.wsdl =================================================================== --- /trunk/autoquest-httpmonitor-test/src/main/resources/DummyService.wsdl (revision 1390) +++ /trunk/autoquest-httpmonitor-test/src/main/resources/DummyService.wsdl (revision 1390) @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/autoquest-httpmonitor-test/src/main/webapp/WEB-INF/cxf-servlet.xml =================================================================== --- /trunk/autoquest-httpmonitor-test/src/main/webapp/WEB-INF/cxf-servlet.xml (revision 1390) +++ /trunk/autoquest-httpmonitor-test/src/main/webapp/WEB-INF/cxf-servlet.xml (revision 1390) @@ -0,0 +1,20 @@ + + + + + + + + + + + + + Index: /trunk/autoquest-httpmonitor-test/src/main/webapp/WEB-INF/web.xml =================================================================== --- /trunk/autoquest-httpmonitor-test/src/main/webapp/WEB-INF/web.xml (revision 1390) +++ /trunk/autoquest-httpmonitor-test/src/main/webapp/WEB-INF/web.xml (revision 1390) @@ -0,0 +1,42 @@ + + + + cxf + + + Apache CXF Endpoint + cxf + cxf + org.apache.cxf.transport.servlet.CXFServlet + 1 + + + + cxf + /* + + + + 60 + + Index: /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java =================================================================== --- /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java (revision 1389) +++ /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java (revision 1390) @@ -22,4 +22,6 @@ import java.util.logging.Level; +import org.apache.catalina.Context; +import org.apache.catalina.startup.Tomcat; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -30,7 +32,4 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; import org.junit.Before; @@ -56,10 +55,15 @@ * */ - protected static final int PORT = 19098; - - /** - * the jetty web server used for receiving messages - */ - private Server dummyServer; + protected static final int DUMMY_SERVER_PORT = 19098; + + /** + * + */ + protected static final int PROXY_PORT = 19099; + + /** + * + */ + protected static final int MONITOR_PORT = 19100; /** @@ -67,4 +71,7 @@ */ private DummyServlet dummyServlet; + + /** */ + private static Tomcat tomcat = new Tomcat(); /** @@ -74,13 +81,34 @@ public void setUp() throws Exception { // setup a simple HTTP server - dummyServer = new Server(PORT + 1); + dummyServlet = new DummyServlet(); + + /*dummyServer = new Server(DUMMY_SERVER_PORT); ServletContextHandler root = - new ServletContextHandler(dummyServer, "/", ServletContextHandler.SESSIONS); - - dummyServlet = new DummyServlet(); + new ServletContextHandler(dummyServer, "/dummyServer", ServletContextHandler.SESSIONS); + + root.addServlet(new ServletHolder(dummyServlet), "/*"); - - dummyServer.start(); + + dummyServer.start();*/ + + File tomcatDir = new File("target/test/tomcat"); + File webappRootDir = new File(tomcatDir, "webapp"); + + tomcat = new Tomcat(); + tomcat.setPort(DUMMY_SERVER_PORT); + tomcat.setBaseDir(tomcatDir.getAbsolutePath()); + + File warFile = new File(webappRootDir, "dummyService.war"); + tomcat.addWebapp("/dummyWebapp", warFile.getAbsolutePath()); + System.out.println("configuring Dummy Service from " + warFile.getAbsolutePath()); + + File servletRootDir = new File(tomcatDir, "servlet"); + servletRootDir.mkdirs(); + Context ctx = tomcat.addContext("/", servletRootDir.getAbsolutePath()); + Tomcat.addServlet(ctx, "dummyServlet", dummyServlet); + ctx.addServletMapping("/dummyServlet", "dummyServlet"); + + tomcat.start(); setUpHook(); @@ -103,10 +131,12 @@ tearDownHook(); - if (dummyServer != null) { + if (tomcat != null) { try { - dummyServer.stop(); + tomcat.stop(); + tomcat.getServer().await(); + tomcat.destroy(); } finally { - dummyServer = null; + tomcat = null; } } @@ -133,16 +163,17 @@ if ("POST".equals(type)) { - httpRequest = new HttpPost("http://localhost:" + PORT + "/"); + httpRequest = new HttpPost("http://localhost:" + PROXY_PORT + "/dummyServlet"); HttpEntity entity = new StringEntity(message, ContentType.TEXT_PLAIN); ((HttpPost) httpRequest).setEntity(entity); } else if ("GET".equals(type)) { - httpRequest = new HttpGet("http://localhost:" + PORT + "/"); + httpRequest = new HttpGet("http://localhost:" + PROXY_PORT + "/dummyServlet"); } try { HttpResponse response = httpclient.execute(httpRequest); + System.err.println(response.getStatusLine()); String responseStr = readStreamContentToString(response.getEntity().getContent()); - System.err.println("received response: " + message); + System.err.println("received response: " + responseStr); return responseStr; } Index: /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java =================================================================== --- /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java (revision 1389) +++ /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java (revision 1390) @@ -94,5 +94,5 @@ @Test public void test_SimulatedSession_MonitorOnly() throws Exception { - monitor = new HttpMonitor(new String[] { LOG_FILE_DIR, PORT +"" }); + monitor = new HttpMonitor(new String[] { LOG_FILE_DIR, MONITOR_PORT + "" }); monitor.init(); @@ -155,5 +155,5 @@ @Test public void test_SimpleText_ProxyAndMonitor() throws Exception { - monitor = new HttpMonitor(new String[] { LOG_FILE_DIR, (PORT + 2) + "" }); + monitor = new HttpMonitor(new String[] { LOG_FILE_DIR, MONITOR_PORT + "" }); monitor.init(); @@ -161,6 +161,6 @@ proxy = new HttpMonitoringProxy - (new String[] { LOG_FILE_DIR, PORT +"", - "localhost:" + (PORT + 1), "localhost:" + (PORT + 2) }); + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", + "localhost:" + DUMMY_SERVER_PORT, "localhost:" + MONITOR_PORT }); proxy.init(); @@ -216,5 +216,5 @@ @Test public void test_XMLMessage_ProxyAndMonitor() throws Exception { - monitor = new HttpMonitor(new String[] { LOG_FILE_DIR, (PORT + 2) + "" }); + monitor = new HttpMonitor(new String[] { LOG_FILE_DIR, MONITOR_PORT + "" }); monitor.init(); @@ -222,6 +222,6 @@ proxy = new HttpMonitoringProxy - (new String[] { LOG_FILE_DIR, PORT +"", - "localhost:" + (PORT + 1), "localhost:" + (PORT + 2) }); + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", + "localhost:" + DUMMY_SERVER_PORT, "localhost:" + MONITOR_PORT }); proxy.init(); @@ -315,5 +315,5 @@ for (HttpExchange exchange : exchanges) { - HttpPost httpRequest = new HttpPost("http://localhost:" + PORT + "/"); + HttpPost httpRequest = new HttpPost("http://localhost:" + MONITOR_PORT + "/"); JAXBContext jaxbContext = Index: /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java =================================================================== --- /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java (revision 1389) +++ /trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java (revision 1390) @@ -20,4 +20,5 @@ import java.io.IOException; import java.io.StringReader; +import java.net.URL; import java.util.Collection; import java.util.Iterator; @@ -32,4 +33,5 @@ import javax.xml.bind.JAXBElement; import javax.xml.bind.Unmarshaller; +import javax.xml.namespace.QName; import org.eclipse.jetty.server.Server; @@ -37,4 +39,8 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.junit.Test; + +import dummyservice.ObjectFactory; +import dummyservice.VerifyUserInMsgType; +import dummyservice.VerifyUserOutMsgType; import de.ugoe.cs.autoquest.eventcore.Event; @@ -45,4 +51,6 @@ import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType; import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget; +import dummyservice.DummyService; +import dummyservice.DummyServicePortType; /** @@ -73,5 +81,5 @@ messages = new LinkedList(); - dummyMonitor = new Server(PORT + 2); + dummyMonitor = new Server(MONITOR_PORT); ServletContextHandler root = new ServletContextHandler(dummyMonitor, "/", ServletContextHandler.SESSIONS); @@ -113,5 +121,6 @@ public void test_SimpleText_Local() throws Exception { proxy = new HttpMonitoringProxy - (new String[] { LOG_FILE_DIR, PORT +"", "localhost:" + (PORT + 1), "local" }); + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", "localhost:" + DUMMY_SERVER_PORT, + "local" }); proxy.init(); @@ -155,6 +164,6 @@ public void test_SimpleText_Remote() throws Exception { proxy = new HttpMonitoringProxy - (new String[] { LOG_FILE_DIR, PORT +"", - "localhost:" + (PORT + 1), "localhost:" + (PORT + 2) }); + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", + "localhost:" + DUMMY_SERVER_PORT, "localhost:" + MONITOR_PORT }); proxy.init(); @@ -190,5 +199,6 @@ public void test_XMLMessage_Local() throws Exception { proxy = new HttpMonitoringProxy - (new String[] { LOG_FILE_DIR, PORT +"", "localhost:" + (PORT + 1), "local" }); + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", "localhost:" + DUMMY_SERVER_PORT, + "local" }); proxy.init(); @@ -265,6 +275,6 @@ public void test_XMLMessage_Remote() throws Exception { proxy = new HttpMonitoringProxy - (new String[] { LOG_FILE_DIR, PORT +"", - "localhost:" + (PORT + 1), "localhost:" + (PORT + 2) }); + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", + "localhost:" + DUMMY_SERVER_PORT, "localhost:" + MONITOR_PORT }); proxy.init(); @@ -330,4 +340,110 @@ } + @Test + public void test_SOAP_Local() throws Exception { + proxy = new HttpMonitoringProxy + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", "localhost:" + DUMMY_SERVER_PORT, + "local" }); + + proxy.init(); + proxy.start(); + + DummyService service = new DummyService + (new URL("http://localhost:" + PROXY_PORT + "/dummyWebapp/DummyServiceSOAPPort?wsdl"), + new QName("DummyService", "DummyService")); + + DummyServicePortType dummyService = service.getDummyServiceSOAPPort(); + + ObjectFactory factory = new ObjectFactory(); + VerifyUserInMsgType request = factory.createVerifyUserInMsgType(); + VerifyUserOutMsgType response = dummyService.verifyUser(request); + + assertNotNull(response); + + proxy.stop(); + proxy = null; + + File logFile = new File(LOG_FILE_DIR + File.separator + "httpmonitor_000.log"); + + assertTrue(logFile.exists()); + + HTTPLogParser parser = new HTTPLogParser(); + + parser.parseFile(logFile); + + // check the sequences + Collection> sequences = parser.getSequences(); + + assertNotNull(sequences); + + Iterator> iterator = sequences.iterator(); + assertTrue(iterator.hasNext()); + + List sequence = iterator.next(); + assertFalse(iterator.hasNext()); + + assertNotNull(sequence); + assertEquals(2, sequence.size()); + + assertEvent(sequence.get(0), "GET", null, null); // get WSDL + assertEvent(sequence.get(1), "POST", null, null); // send request + } + + @SuppressWarnings("unchecked") + @Test + public void test_SOAP_Remote() throws Exception { + proxy = new HttpMonitoringProxy + (new String[] { LOG_FILE_DIR, PROXY_PORT + "", "localhost:" + DUMMY_SERVER_PORT, + "localhost:" + MONITOR_PORT }); + + proxy.init(); + proxy.start(); + + DummyService service = new DummyService + (new URL("http://localhost:" + PROXY_PORT + "/dummyWebapp/DummyServiceSOAPPort?wsdl"), + new QName("DummyService", "DummyService")); + + DummyServicePortType dummyService = service.getDummyServiceSOAPPort(); + + ObjectFactory factory = new ObjectFactory(); + VerifyUserInMsgType request = factory.createVerifyUserInMsgType(); + VerifyUserOutMsgType response = dummyService.verifyUser(request); + + assertNotNull(response); + + proxy.stop(); + proxy = null; + + // give the proxy some time to send the copy of the message + while(messages.size() < 1) { + Thread.sleep(1000); + } + + assertEquals(2, messages.size()); + + JAXBContext jaxbContext = JAXBContext.newInstance(HttpExchange.class.getPackage().getName()); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + + JAXBElement jaxObject = + (JAXBElement) unmarshaller.unmarshal(new StringReader(messages.get(0))); + + HttpExchange exchange = jaxObject.getValue(); + + assertEquals(Method.GET, exchange.getRequest().getMethod()); + + assertNull(exchange.getRequest().getContent()); + assertNotNull(exchange.getResponse().getContent().getData()); + + jaxObject = + (JAXBElement) unmarshaller.unmarshal(new StringReader(messages.get(1))); + + exchange = jaxObject.getValue(); + + assertEquals(Method.POST, exchange.getRequest().getMethod()); + + assertNotNull(exchange.getRequest().getContent().getData()); + assertNotNull(exchange.getResponse().getContent().getData()); + } + /** * @@ -344,6 +460,18 @@ assertEquals(Method.fromValue(method), exchange.getRequest().getMethod()); - assertEquals(message, exchange.getRequest().getContent().getData()); - assertEquals(response, exchange.getResponse().getContent().getData()); + + if (message != null) { + assertEquals(message, exchange.getRequest().getContent().getData()); + } + else if (exchange.getRequest().getContent() != null) { + System.err.println(exchange.getRequest().getContent().getData()); + } + + if (response != null) { + assertEquals(response, exchange.getResponse().getContent().getData()); + } + else if (exchange.getResponse().getContent() != null) { + System.err.println(exchange.getResponse().getContent().getData()); + } }