From 76006ca3802dcc6ba6b94e62b13f572ed6a06e76 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 25 Jun 2008 17:14:47 +0000
Subject: [PATCH] Introduce automated integration tests on the web app

git-svn-id: https://svn.argeo.org/slc/trunk@1282 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.webapp/.classpath               |   2 +
 org.argeo.slc.webapp/pom.xml                  | 109 +++++++++++++-----
 .../argeo/slc/ws/SlcAntWsIntegrationTest.java |  13 +++
 .../slc/ws/SlcExecutionWsIntegrationTest.java |  29 +++++
 .../ws/TreeTestResultWsIntegrationTest.java   |  70 +++++++++++
 .../resources/org/argeo/slc/ant/build.xml     |  25 ++++
 .../org/argeo/slc/ant/nonDepContext.xml       |  42 +++++++
 .../org/argeo/slc/ws/applicationContext.xml   |  11 ++
 .../resources/org/argeo/slc/ws/execution.xml  |  24 ++++
 .../resources/org/argeo/slc/ws/result.xml     |  20 ++++
 10 files changed, 315 insertions(+), 30 deletions(-)
 create mode 100644 org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
 create mode 100644 org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
 create mode 100644 org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
 create mode 100644 org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/build.xml
 create mode 100644 org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
 create mode 100644 org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
 create mode 100644 org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml
 create mode 100644 org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml

diff --git a/org.argeo.slc.webapp/.classpath b/org.argeo.slc.webapp/.classpath
index 3e7b945f6..fe6837c7e 100644
--- a/org.argeo.slc.webapp/.classpath
+++ b/org.argeo.slc.webapp/.classpath
@@ -2,6 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index a733e9603..be075fb5b 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -1,31 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.9-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
-	</parent>
-	<artifactId>org.argeo.slc.webapp</artifactId>
-	<packaging>war</packaging>
-	<name>Argeo SLC Web Application</name>
-	<build>
-		<finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc</artifactId>
+		<version>0.9-SNAPSHOT</version>
+		<relativePath>../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.webapp</artifactId>
+	<packaging>war</packaging>
+	<name>Argeo SLC Web Application</name>
+	<build>
+		<finalName>${artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+				<executions>
+					<execution>
+						<id>surefire-it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start-jetty</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<scanIntervalSeconds>0</scanIntervalSeconds>
+							<daemon>true</daemon>
+						</configuration>
+					</execution>
+					<execution>
+						<id>stop-jetty</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>argeo-slc-server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>argeo-slc-agent</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
new file mode 100644
index 000000000..ed3634db4
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
@@ -0,0 +1,13 @@
+package org.argeo.slc.ws;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.ant.unit.MinimalAntClasspathTestCase;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+
+public class SlcAntWsIntegrationTest extends MinimalAntClasspathTestCase {
+	public void testSimpleRun() {
+		execute("/org/argeo/slc/ant/build.xml");
+	}
+
+}
diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
new file mode 100644
index 000000000..47d584f23
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
@@ -0,0 +1,29 @@
+package org.argeo.slc.ws;
+
+import org.springframework.ws.client.core.WebServiceTemplate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.msg.process.SlcExecutionRequest;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
+
+public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase {
+	private Log log = LogFactory.getLog(getClass());
+
+	public void testSendSlcExecutionrequest() {
+		WebServiceTemplate template = getBean(WebServiceTemplate.class);
+		SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
+
+		SlcExecutionRequest req = new SlcExecutionRequest();
+		req.setSlcExecution(slcExec);
+
+		log.info("Send SlcExecutionRequest for SlcExecution "
+				+ slcExec.getUuid());
+
+		Object resp = template.marshalSendAndReceive(req);
+		log.info("Resp: " + resp);
+	}
+}
diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
new file mode 100644
index 000000000..7796c26d7
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
@@ -0,0 +1,70 @@
+package org.argeo.slc.ws;
+
+import org.springframework.ws.client.core.WebServiceTemplate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
+
+import org.argeo.slc.core.test.tree.TreeTestResult;
+import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.ResultPartRequest;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+
+public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
+	private Log log = LogFactory.getLog(getClass());
+
+	public void testCreateTreeTestResultRequest() {
+		WebServiceTemplate template = getBean(WebServiceTemplate.class);
+		CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
+				createCompleteTreeTestResult());
+		req.getTreeTestResult().close();// in order to avoid unclosed in test db
+
+		log.info("Send CreateTreeTestResultRequest for result "
+				+ req.getTreeTestResult().getUuid());
+
+		Object resp = template.marshalSendAndReceive(req);
+		log.info("Resp: " + resp);
+	}
+
+	public void testResultPartRequest() {
+		WebServiceTemplate template = getBean(WebServiceTemplate.class);
+		TreeTestResult ttr = createCompleteTreeTestResult();
+		ttr.close();// in order to avoid unclosed in test db
+		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
+				ttr);
+		log.info("Send CreateTreeTestResultRequest for result "
+				+ reqCreate.getTreeTestResult().getUuid());
+		template.marshalSendAndReceive(reqCreate);
+
+		ResultPartRequest req = createSimpleResultPartRequest(ttr);
+
+		log.info("Send ResultPartRequest for result " + req.getResultUuid());
+		Object resp = template.marshalSendAndReceive(req);
+		log.info("Resp: " + resp);
+	}
+
+	public void testCloseTreeTestResultRequest() {
+		WebServiceTemplate template = getBean(WebServiceTemplate.class);
+
+		TreeTestResult ttr = createCompleteTreeTestResult();
+		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
+				ttr);
+		log.info("Send CreateTreeTestResultRequest for result "
+				+ reqCreate.getTreeTestResult().getUuid());
+		template.marshalSendAndReceive(reqCreate);
+
+		ttr.close();
+		CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
+				.getUuid(), ttr.getCloseDate());
+
+		log.info("Send CloseTreeTestResultRequest for result "
+				+ req.getResultUuid());
+
+		Object resp = template.marshalSendAndReceive(req);
+		log.info("Resp: " + resp);
+	}
+}
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/build.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/build.xml
new file mode 100644
index 000000000..35de7be94
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/build.xml
@@ -0,0 +1,25 @@
+<project default="test">
+
+	<target name="test">
+		<echo message="Hello World!" />
+
+		<slc.test>
+			<testDefinition bean="testDef" />
+			<testData bean="testData1" />
+		</slc.test>
+
+		<slc.test>
+			<testDefinition bean="testDef" />
+			<testData bean="testData.context1" />
+		</slc.test>
+
+		<slc.test path="/testRoot/testContext">
+			<testDefinition bean="testDef" />
+			<testData bean="testData.context1" />
+		</slc.test>
+
+		<slc.closeResult>
+			<result bean="testResult" />
+		</slc.closeResult>
+	</target>
+</project>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
new file mode 100644
index 000000000..56da88a8b
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import
+		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+
+	<bean name="testDef"
+		class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />
+
+	<bean name="testData1"
+		class="org.argeo.slc.core.test.BasicTestData">
+		<property name="expected">
+			<value>toto</value>
+		</property>
+		<property name="reached">
+			<value>toto</value>
+		</property>
+	</bean>
+
+	<bean id="testData.context1" parent="context.template">
+		<property name="values">
+			<map>
+				<entry key="reference" value="20" />
+				<entry key="varIntern" value="60" />
+			</map>
+		</property>
+		<property name="expectedValues">
+			<map>
+				<entry key="reference" value="21" />
+				<entry key="varIntern" value="60" />
+			</map>
+		</property>
+	</bean>
+
+	<bean id="context.template"
+		class="org.argeo.slc.core.test.context.DefaultContextTestData"
+		abstract="true">
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
new file mode 100644
index 000000000..a94d128b3
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
@@ -0,0 +1,11 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import
+		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
+	<import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
+	<import resource="execution.xml" />
+	<import resource="result.xml" />
+
+</beans>
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml
new file mode 100644
index 000000000..b28885837
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import
+		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
+
+	<bean name="executionBuildListener"
+		class="org.argeo.slc.ant.SlcExecutionBuildListener">
+		<property name="notifiers">
+			<list>
+				<ref bean="slcDefault.ws.client.slcExecutionNotifier" />
+			</list>
+		</property>
+	</bean>
+
+	<bean name="fileNotifier"
+		class="org.argeo.slc.core.process.FileSlcExecutionNotifier">
+		<property name="basePath" value="${slc.workDir}/process" />
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml
new file mode 100644
index 000000000..ce5442d5e
--- /dev/null
+++ b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import
+		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
+
+	<bean id="testResult"
+		parent="slcDefault.test.basicTreeTestResult">
+		<property name="listeners">
+			<list merge="true">
+				<ref
+					bean="slcDefault.ws.client.treeTestResultWsNotfier" />
+				<ref bean="slcDefault.castor.xsltReportGenerator" />
+			</list>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
-- 
2.39.5