From 2d93486e9d12f22409944d774911fe755e1350dc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 25 Jun 2008 17:14:29 +0000 Subject: [PATCH] Introduce automated integration tests on the web app git-svn-id: https://svn.argeo.org/slc/trunk@1281 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../ant/unit/MinimalAntClasspathTestCase.java | 27 +++++++ .../java/org/argeo/slc/ant/SlcAntTest.java | 17 +---- .../argeo/slc/ws/SlcAntWsIntegrationTest.java | 22 ------ .../slc/ws/SlcExecutionWsIntegrationTest.java | 29 -------- .../ws/TreeTestResultWsIntegrationTest.java | 70 ------------------- .../argeo/slc/castor/applicationContext.xml | 11 --- .../org/argeo/slc/ws/applicationContext.xml | 11 --- .../resources/org/argeo/slc/ws/execution.xml | 24 ------- .../resources/org/argeo/slc/ws/result.xml | 20 ------ 9 files changed, 30 insertions(+), 201 deletions(-) create mode 100644 org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java delete mode 100644 org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java delete mode 100644 org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java delete mode 100644 org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java delete mode 100644 org.argeo.slc.agent/src/test/resources/org/argeo/slc/castor/applicationContext.xml delete mode 100644 org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/applicationContext.xml delete mode 100644 org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/execution.xml delete mode 100644 org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/result.xml diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java new file mode 100644 index 000000000..df07c9687 --- /dev/null +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java @@ -0,0 +1,27 @@ +package org.argeo.slc.ant.unit; + +import java.io.File; + +import org.argeo.slc.ant.AntConstants; +import org.argeo.slc.ant.AntSlcApplication; +import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.unit.AbstractSpringTestCase; +import org.springframework.core.io.FileSystemResource; + +public class MinimalAntClasspathTestCase extends AbstractSpringTestCase { + protected void execute(String scriptPath) { + AntSlcApplication slcApp = new AntSlcApplication(); + slcApp.setRootDir(new FileSystemResource(new File("src/test/resources") + .getAbsolutePath() + + File.separator)); + slcApp.setWorkDir(new File(System.getProperty("java.io.tmpdir"))); + slcApp.setParentContext(getContext()); + + SlcExecution slcExecution = new SlcExecution(); + slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_FILE, + scriptPath); + + slcApp.execute(slcExecution, null, null, null); + } + +} diff --git a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ant/SlcAntTest.java b/org.argeo.slc.agent/src/test/java/org/argeo/slc/ant/SlcAntTest.java index ad63b34b5..9cfa21422 100644 --- a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ant/SlcAntTest.java +++ b/org.argeo.slc.agent/src/test/java/org/argeo/slc/ant/SlcAntTest.java @@ -2,26 +2,15 @@ package org.argeo.slc.ant; import java.io.File; +import org.argeo.slc.ant.unit.MinimalAntClasspathTestCase; import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.unit.AbstractSpringTestCase; import org.springframework.core.io.FileSystemResource; -public class SlcAntTest extends AbstractSpringTestCase { +public class SlcAntTest extends MinimalAntClasspathTestCase { // private Log log = LogFactory.getLog(getClass()); public void testSimpleRun() { - AntSlcApplication slcApp = new AntSlcApplication(); - slcApp.setRootDir(new FileSystemResource(new File("src/test/resources") - .getAbsolutePath() - + File.separator)); - slcApp.setWorkDir(new File(System.getProperty("java.io.tmpdir"))); - slcApp.setParentContext(getContext()); - - SlcExecution slcExecution = new SlcExecution(); - slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_FILE, - "/org/argeo/slc/ant/build.xml"); - - slcApp.execute(slcExecution, null, null, null); + execute("/org/argeo/slc/ant/build.xml"); } - } diff --git a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java b/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java deleted file mode 100644 index ab80744af..000000000 --- a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcAntWsIntegrationTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.argeo.slc.ws; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.unit.AbstractSpringTestCase; - -public class SlcAntWsIntegrationTest extends AbstractSpringTestCase { - private Log log = LogFactory.getLog(getClass()); - - public void testSimpleRun() { - fail("Adapt to new runtime"); - // AntRegistryUtil.runAll(getClass().getResource( - // "/org/argeo/slc/ant/build.xml"), "test", null); - - // URL url = getClass().getResource("/org/argeo/slc/ant/build.xml"); - // log.info("Run Ant file from URL: " + url); - // AntRunner antRunner = new AntRunner(getContext(), url, "test"); - // - // antRunner.run(); - } - -} diff --git a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java deleted file mode 100644 index 47d584f23..000000000 --- a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java +++ /dev/null @@ -1,29 +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 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.agent/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java deleted file mode 100644 index 7796c26d7..000000000 --- a/org.argeo.slc.agent/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java +++ /dev/null @@ -1,70 +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()); - - 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.agent/src/test/resources/org/argeo/slc/castor/applicationContext.xml b/org.argeo.slc.agent/src/test/resources/org/argeo/slc/castor/applicationContext.xml deleted file mode 100644 index 7a89af927..000000000 --- a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/castor/applicationContext.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/applicationContext.xml b/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/applicationContext.xml deleted file mode 100644 index a94d128b3..000000000 --- a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/applicationContext.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/execution.xml b/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/execution.xml deleted file mode 100644 index b28885837..000000000 --- a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/execution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/result.xml b/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/result.xml deleted file mode 100644 index ce5442d5e..000000000 --- a/org.argeo.slc.agent/src/test/resources/org/argeo/slc/ws/result.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file -- 2.39.2