Move integration tests

git-svn-id: https://svn.argeo.org/slc/trunk@2017 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..7d4d067
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java
@@ -0,0 +1,85 @@
+package org.argeo.slc.ws;
+
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createMinimalConsistentTreeTestResult;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartError;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartFailed;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartPassed;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.core.test.SimpleResultPart;
+import org.argeo.slc.core.test.tree.TreeTestResult;
+import org.argeo.slc.msg.process.SlcExecutionRequest;
+import org.argeo.slc.msg.process.SlcExecutionStatusRequest;
+import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
+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.process.SlcExecution;
+import org.argeo.slc.process.SlcExecutionStep;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
+import org.springframework.ws.client.core.WebServiceTemplate;
+
+public class ScenarioWsIntegrationTest extends AbstractSpringTestCase {
+       private Log log = LogFactory.getLog(getClass());
+
+       private WebServiceTemplate template;
+
+       public void setUp() {
+               template = getBean(WebServiceTemplate.class);
+       }
+
+       public void testSinglePathScenario() {
+               // Create SLC execution
+               SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
+               log.info("Send create SlcExecutionRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               template.marshalSendAndReceive(new SlcExecutionRequest(slcExec));
+
+               // Add SLC execution step
+               SlcExecutionStep step = new SlcExecutionStep("JUnit step");
+               slcExec.getSteps().add(step);
+               log.info("Send SlcExecutionStepsRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               template.marshalSendAndReceive(new SlcExecutionStepsRequest(slcExec
+                               .getUuid(), step));
+
+               // Create test result
+               TreeTestResult ttr = createMinimalConsistentTreeTestResult(slcExec);
+               ttr.addResultPart(createSimpleResultPartPassed());
+               log.info("Send CreateTreeTestResultRequest for result #"
+                               + ttr.getUuid());
+               template.marshalSendAndReceive(new CreateTreeTestResultRequest(ttr));
+
+               // Add failed part
+               SimpleResultPart failedPart = createSimpleResultPartFailed();
+               ttr.addResultPart(failedPart);
+               log.info("Send ResultPartRequest for result #" + ttr.getUuid());
+               template.marshalSendAndReceive(new ResultPartRequest(ttr, null,
+                               failedPart));
+
+               // Add error part
+               SimpleResultPart errorPart = createSimpleResultPartError();
+               ttr.addResultPart(errorPart);
+               log.info("Send ResultPartRequest for result #" + ttr.getUuid());
+               template.marshalSendAndReceive(new ResultPartRequest(ttr, null,
+                               errorPart));
+
+               // Close result
+               ttr.close();
+               log
+                               .info("Send CloseTreeTestResultRequest for result #"
+                                               + ttr.getUuid());
+               template.marshalSendAndReceive(new CloseTreeTestResultRequest(ttr
+                               .getUuid(), ttr.getCloseDate()));
+
+               // Notify SLC execution FINISHED
+               slcExec.setStatus(SlcExecution.STATUS_FINISHED);
+               log.info("Send SlcExecutionStatusRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               template.marshalSendAndReceive(new SlcExecutionStatusRequest(slcExec
+                               .getUuid(), slcExec.getStatus()));
+       }
+
+}

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..7c37e53
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
@@ -0,0 +1,10 @@
+package org.argeo.slc.ws;\r
+\r
+import org.argeo.slc.ant.unit.MinimalAntClasspathTestCase;\r
+\r
+public class SlcAntWsIntegrationTest extends MinimalAntClasspathTestCase {\r
+       public void testSimpleRun() {\r
+               execute("/org/argeo/slc/ant/build.xml");\r
+       }\r
+\r
+}\r

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..b40e973
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
@@ -0,0 +1,79 @@
+package org.argeo.slc.ws;
+
+import java.util.List;
+import java.util.Vector;
+
+import org.springframework.ws.client.core.WebServiceTemplate;
+import org.springframework.ws.soap.client.SoapFaultClientException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.argeo.slc.msg.process.SlcExecutionRequest;
+import org.argeo.slc.msg.process.SlcExecutionStatusRequest;
+import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
+import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.process.SlcExecutionStep;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
+import org.argeo.slc.ws.client.WebServiceUtils;
+
+public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase {
+       private Log log = LogFactory.getLog(getClass());
+
+       private WebServiceTemplate template;
+
+       public void setUp() {
+               template = getBean(WebServiceTemplate.class);
+       }
+
+       public void testSlcExecutionRequests() {
+               SlcExecution slcExec = createAndSendSlcExecution();
+
+               slcExec.setUser("otherUser");
+               log.info("Send update SlcExecutionRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               template.marshalSendAndReceive(new SlcExecutionRequest(slcExec));
+       }
+
+       public void testSlcExecutionStatusRequest() {
+               SlcExecution slcExec = createAndSendSlcExecution();
+
+               slcExec.setStatus(SlcExecution.STATUS_FINISHED);
+               log.info("Send SlcExecutionStatusRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               template.marshalSendAndReceive(new SlcExecutionStatusRequest(slcExec
+                               .getUuid(), slcExec.getStatus()));
+       }
+
+       public void testSendSlcExecutionStepRequest() {
+               SlcExecution slcExec = createAndSendSlcExecution();
+
+               SlcExecutionStep step1 = new SlcExecutionStep(
+                               "Logline\nAnother log line.");
+               SlcExecutionStep step2 = new SlcExecutionStep(
+                               "Logline2\nAnother log line2.");
+               List<SlcExecutionStep> steps = new Vector<SlcExecutionStep>();
+               steps.add(step1);
+               steps.add(step2);
+
+               log.info("Send SlcExecutionStepsRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               try {
+                       template.marshalSendAndReceive(new SlcExecutionStepsRequest(slcExec
+                                       .getUuid(), steps));
+               } catch (SoapFaultClientException e) {
+                       WebServiceUtils.manageSoapException(e);
+                       throw e;
+               }
+       }
+
+       protected SlcExecution createAndSendSlcExecution() {
+               SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
+
+               log.info("Send create SlcExecutionRequest for SlcExecution #"
+                               + slcExec.getUuid());
+               template.marshalSendAndReceive(new SlcExecutionRequest(slcExec));
+               return slcExec;
+       }
+}

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..b3c2a7c
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
@@ -0,0 +1,60 @@
+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());
+
+       private WebServiceTemplate template;
+
+       public void setUp() {
+               template = getBean(WebServiceTemplate.class);
+       }
+
+       public void testCreateTreeTestResultRequest() {
+               createAndSendTreeTestResult(true);
+       }
+
+       public void testResultPartRequest() {
+               TreeTestResult ttr = createAndSendTreeTestResult(true);
+
+               ResultPartRequest req = createSimpleResultPartRequest(ttr);
+
+               log.info("Send ResultPartRequest for result " + req.getResultUuid());
+               template.marshalSendAndReceive(req);
+       }
+
+       public void testCloseTreeTestResultRequest() {
+               TreeTestResult ttr = createAndSendTreeTestResult(false);
+
+               ttr.close();
+               CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
+                               .getUuid(), ttr.getCloseDate());
+               log.info("Send CloseTreeTestResultRequest for result "
+                               + req.getResultUuid());
+               template.marshalSendAndReceive(req);
+       }
+
+       protected TreeTestResult createAndSendTreeTestResult(boolean close) {
+               TreeTestResult ttr = createCompleteTreeTestResult();
+               log.info("Send CreateTreeTestResultRequest for result #"
+                               + ttr.getUuid());
+               template.marshalSendAndReceive(new CreateTreeTestResultRequest(ttr));
+
+               if (close)
+                       ttr.close();
+               return ttr;
+       }
+}

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/build.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/build.xml
new file mode 100644 (file)
index 0000000..35de7be
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/build.xml
@@ -0,0 +1,25 @@
+<project default="test">\r
+\r
+       <target name="test">\r
+               <echo message="Hello World!" />\r
+\r
+               <slc.test>\r
+                       <testDefinition bean="testDef" />\r
+                       <testData bean="testData1" />\r
+               </slc.test>\r
+\r
+               <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>\r
+       </target>\r
+</project>
\ No newline at end of file

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
new file mode 100644 (file)
index 0000000..56da88a
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <import\r
+               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
+\r
+       <bean name="testDef"\r
+               class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />\r
+\r
+       <bean name="testData1"\r
+               class="org.argeo.slc.core.test.BasicTestData">\r
+               <property name="expected">\r
+                       <value>toto</value>\r
+               </property>\r
+               <property name="reached">\r
+                       <value>toto</value>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="testData.context1" parent="context.template">\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="reference" value="20" />\r
+                               <entry key="varIntern" value="60" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="21" />\r
+                               <entry key="varIntern" value="60" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="context.template"\r
+               class="org.argeo.slc.core.test.context.DefaultContextTestData"\r
+               abstract="true">\r
+       </bean>\r
+\r
+</beans>
\ No newline at end of file

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
new file mode 100644 (file)
index 0000000..ee822d2
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
@@ -0,0 +1,27 @@
+<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" />
+
+       <bean name="executionBuildListener"
+               class="org.argeo.slc.ant.SlcExecutionBuildListener">
+               <property name="notifiers">
+                       <list>
+                               <ref bean="slcDefault.ws.client.slcExecutionNotifier" />
+                       </list>
+               </property>
+       </bean>
+
+       <bean id="testResult"
+               parent="slcDefault.test.basicTreeTestResult">
+               <property name="listeners">
+                       <list merge="true">
+                               <ref
+                                       bean="slcDefault.ws.client.treeTestResultWsNotfier" />
+                       </list>
+               </property>
+       </bean>
+</beans>

diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java
deleted file mode 100644 (file)
index 7d4d067..0000000
--- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.argeo.slc.ws;
-
-import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createMinimalConsistentTreeTestResult;
-import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartError;
-import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartFailed;
-import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartPassed;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.core.test.SimpleResultPart;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.msg.process.SlcExecutionRequest;
-import org.argeo.slc.msg.process.SlcExecutionStatusRequest;
-import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
-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.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionStep;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-import org.argeo.slc.unit.process.SlcExecutionTestUtils;
-import org.springframework.ws.client.core.WebServiceTemplate;
-
-public class ScenarioWsIntegrationTest extends AbstractSpringTestCase {
-       private Log log = LogFactory.getLog(getClass());
-
-       private WebServiceTemplate template;
-
-       public void setUp() {
-               template = getBean(WebServiceTemplate.class);
-       }
-
-       public void testSinglePathScenario() {
-               // Create SLC execution
-               SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
-               log.info("Send create SlcExecutionRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               template.marshalSendAndReceive(new SlcExecutionRequest(slcExec));
-
-               // Add SLC execution step
-               SlcExecutionStep step = new SlcExecutionStep("JUnit step");
-               slcExec.getSteps().add(step);
-               log.info("Send SlcExecutionStepsRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               template.marshalSendAndReceive(new SlcExecutionStepsRequest(slcExec
-                               .getUuid(), step));
-
-               // Create test result
-               TreeTestResult ttr = createMinimalConsistentTreeTestResult(slcExec);
-               ttr.addResultPart(createSimpleResultPartPassed());
-               log.info("Send CreateTreeTestResultRequest for result #"
-                               + ttr.getUuid());
-               template.marshalSendAndReceive(new CreateTreeTestResultRequest(ttr));
-
-               // Add failed part
-               SimpleResultPart failedPart = createSimpleResultPartFailed();
-               ttr.addResultPart(failedPart);
-               log.info("Send ResultPartRequest for result #" + ttr.getUuid());
-               template.marshalSendAndReceive(new ResultPartRequest(ttr, null,
-                               failedPart));
-
-               // Add error part
-               SimpleResultPart errorPart = createSimpleResultPartError();
-               ttr.addResultPart(errorPart);
-               log.info("Send ResultPartRequest for result #" + ttr.getUuid());
-               template.marshalSendAndReceive(new ResultPartRequest(ttr, null,
-                               errorPart));
-
-               // Close result
-               ttr.close();
-               log
-                               .info("Send CloseTreeTestResultRequest for result #"
-                                               + ttr.getUuid());
-               template.marshalSendAndReceive(new CloseTreeTestResultRequest(ttr
-                               .getUuid(), ttr.getCloseDate()));
-
-               // Notify SLC execution FINISHED
-               slcExec.setStatus(SlcExecution.STATUS_FINISHED);
-               log.info("Send SlcExecutionStatusRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               template.marshalSendAndReceive(new SlcExecutionStatusRequest(slcExec
-                               .getUuid(), slcExec.getStatus()));
-       }
-
-}

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
deleted file mode 100644 (file)
index 7c37e53..0000000
--- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.argeo.slc.ws;\r
-\r
-import org.argeo.slc.ant.unit.MinimalAntClasspathTestCase;\r
-\r
-public class SlcAntWsIntegrationTest extends MinimalAntClasspathTestCase {\r
-       public void testSimpleRun() {\r
-               execute("/org/argeo/slc/ant/build.xml");\r
-       }\r
-\r
-}\r

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
deleted file mode 100644 (file)
index b40e973..0000000
--- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.argeo.slc.ws;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.springframework.ws.client.core.WebServiceTemplate;
-import org.springframework.ws.soap.client.SoapFaultClientException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.argeo.slc.msg.process.SlcExecutionRequest;
-import org.argeo.slc.msg.process.SlcExecutionStatusRequest;
-import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
-import org.argeo.slc.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionStep;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-import org.argeo.slc.unit.process.SlcExecutionTestUtils;
-import org.argeo.slc.ws.client.WebServiceUtils;
-
-public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase {
-       private Log log = LogFactory.getLog(getClass());
-
-       private WebServiceTemplate template;
-
-       public void setUp() {
-               template = getBean(WebServiceTemplate.class);
-       }
-
-       public void testSlcExecutionRequests() {
-               SlcExecution slcExec = createAndSendSlcExecution();
-
-               slcExec.setUser("otherUser");
-               log.info("Send update SlcExecutionRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               template.marshalSendAndReceive(new SlcExecutionRequest(slcExec));
-       }
-
-       public void testSlcExecutionStatusRequest() {
-               SlcExecution slcExec = createAndSendSlcExecution();
-
-               slcExec.setStatus(SlcExecution.STATUS_FINISHED);
-               log.info("Send SlcExecutionStatusRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               template.marshalSendAndReceive(new SlcExecutionStatusRequest(slcExec
-                               .getUuid(), slcExec.getStatus()));
-       }
-
-       public void testSendSlcExecutionStepRequest() {
-               SlcExecution slcExec = createAndSendSlcExecution();
-
-               SlcExecutionStep step1 = new SlcExecutionStep(
-                               "Logline\nAnother log line.");
-               SlcExecutionStep step2 = new SlcExecutionStep(
-                               "Logline2\nAnother log line2.");
-               List<SlcExecutionStep> steps = new Vector<SlcExecutionStep>();
-               steps.add(step1);
-               steps.add(step2);
-
-               log.info("Send SlcExecutionStepsRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               try {
-                       template.marshalSendAndReceive(new SlcExecutionStepsRequest(slcExec
-                                       .getUuid(), steps));
-               } catch (SoapFaultClientException e) {
-                       WebServiceUtils.manageSoapException(e);
-                       throw e;
-               }
-       }
-
-       protected SlcExecution createAndSendSlcExecution() {
-               SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
-
-               log.info("Send create SlcExecutionRequest for SlcExecution #"
-                               + slcExec.getUuid());
-               template.marshalSendAndReceive(new SlcExecutionRequest(slcExec));
-               return slcExec;
-       }
-}

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
deleted file mode 100644 (file)
index b3c2a7c..0000000
--- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-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());
-
-       private WebServiceTemplate template;
-
-       public void setUp() {
-               template = getBean(WebServiceTemplate.class);
-       }
-
-       public void testCreateTreeTestResultRequest() {
-               createAndSendTreeTestResult(true);
-       }
-
-       public void testResultPartRequest() {
-               TreeTestResult ttr = createAndSendTreeTestResult(true);
-
-               ResultPartRequest req = createSimpleResultPartRequest(ttr);
-
-               log.info("Send ResultPartRequest for result " + req.getResultUuid());
-               template.marshalSendAndReceive(req);
-       }
-
-       public void testCloseTreeTestResultRequest() {
-               TreeTestResult ttr = createAndSendTreeTestResult(false);
-
-               ttr.close();
-               CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
-                               .getUuid(), ttr.getCloseDate());
-               log.info("Send CloseTreeTestResultRequest for result "
-                               + req.getResultUuid());
-               template.marshalSendAndReceive(req);
-       }
-
-       protected TreeTestResult createAndSendTreeTestResult(boolean close) {
-               TreeTestResult ttr = createCompleteTreeTestResult();
-               log.info("Send CreateTreeTestResultRequest for result #"
-                               + ttr.getUuid());
-               template.marshalSendAndReceive(new CreateTreeTestResultRequest(ttr));
-
-               if (close)
-                       ttr.close();
-               return ttr;
-       }
-}

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
deleted file mode 100644 (file)
index 35de7be..0000000
--- a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<project default="test">\r
-\r
-       <target name="test">\r
-               <echo message="Hello World!" />\r
-\r
-               <slc.test>\r
-                       <testDefinition bean="testDef" />\r
-                       <testData bean="testData1" />\r
-               </slc.test>\r
-\r
-               <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>\r
-       </target>\r
-</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
deleted file mode 100644 (file)
index 56da88a..0000000
--- a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <bean name="testDef"\r
-               class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />\r
-\r
-       <bean name="testData1"\r
-               class="org.argeo.slc.core.test.BasicTestData">\r
-               <property name="expected">\r
-                       <value>toto</value>\r
-               </property>\r
-               <property name="reached">\r
-                       <value>toto</value>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="testData.context1" parent="context.template">\r
-               <property name="values">\r
-                       <map>\r
-                               <entry key="reference" value="20" />\r
-                               <entry key="varIntern" value="60" />\r
-                       </map>\r
-               </property>\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="reference" value="21" />\r
-                               <entry key="varIntern" value="60" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="context.template"\r
-               class="org.argeo.slc.core.test.context.DefaultContextTestData"\r
-               abstract="true">\r
-       </bean>\r
-\r
-</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
deleted file mode 100644 (file)
index ee822d2..0000000
--- a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<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" />
-
-       <bean name="executionBuildListener"
-               class="org.argeo.slc.ant.SlcExecutionBuildListener">
-               <property name="notifiers">
-                       <list>
-                               <ref bean="slcDefault.ws.client.slcExecutionNotifier" />
-                       </list>
-               </property>
-       </bean>
-
-       <bean id="testResult"
-               parent="slcDefault.test.basicTreeTestResult">
-               <property name="listeners">
-                       <list merge="true">
-                               <ref
-                                       bean="slcDefault.ws.client.treeTestResultWsNotfier" />
-                       </list>
-               </property>
-       </bean>
-</beans>