Remove old integration tests
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 2 Jun 2009 15:59:44 +0000 (15:59 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 2 Jun 2009 15:59:44 +0000 (15:59 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@2441 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

integration-tests/org.argeo.slc.it.webapp/.classpath
integration-tests/org.argeo.slc.it.webapp/pom.xml
integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/ScenarioWsIntegrationTest.java [new file with mode: 0644]
integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/SlcAntWsIntegrationTest.java [new file with mode: 0644]
integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java [new file with mode: 0644]
integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java [new file with mode: 0644]
integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java [deleted file]
integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java [deleted file]
integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java [deleted file]
integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java [deleted file]

index c06db5ab6d669f4a0fd8e19353b62d3516a52fd3..85438c4cfa09bf10aed027538591d42cd7670b5b 100644 (file)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+       <classpathentry kind="src" path="src/test/java"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>
index 7ebc060161745bcc37626288743f048e4982da36..6b15ce4a7b46b02987d7ba5c70a464cdbd647a43 100644 (file)
        <name>Argeo SLC Web Application Integration Tests</name>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <includeArtifactIds>org.argeo.slc.webapp</includeArtifactIds>
-                                                       <stripVersion>true</stripVersion>
-                                                       <overWriteReleases>true</overWriteReleases>
-                                                       <overWriteSnapshots>true</overWriteSnapshots>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
                                        </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-war</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <daemon>true</daemon>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>stop-jetty</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>stop</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
-                                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                                       <webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-                                       <jettyConfig>../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml</jettyConfig>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.webapp</artifactId>
-                       <type>war</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.launcher</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ws.client</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-                       <scope>test</scope>
-               </dependency>
        </dependencies>
 </project>
\ No newline at end of file
diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/ScenarioWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/ScenarioWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..7d4d067
--- /dev/null
@@ -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-old/org/argeo/slc/ws/SlcAntWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/SlcAntWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..7c37e53
--- /dev/null
@@ -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-old/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..b40e973
--- /dev/null
@@ -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-old/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java-old/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
new file mode 100644 (file)
index 0000000..b3c2a7c
--- /dev/null
@@ -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/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java
deleted file mode 100644 (file)
index 7d4d067..0000000
+++ /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/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
deleted file mode 100644 (file)
index 7c37e53..0000000
+++ /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/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
deleted file mode 100644 (file)
index b40e973..0000000
+++ /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/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
deleted file mode 100644 (file)
index b3c2a7c..0000000
+++ /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;
-       }
-}