--- /dev/null
+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);
+ }
+
+}
\r
import java.io.File;\r
\r
+import org.argeo.slc.ant.unit.MinimalAntClasspathTestCase;\r
import org.argeo.slc.core.process.SlcExecution;\r
import org.argeo.slc.unit.AbstractSpringTestCase;\r
import org.springframework.core.io.FileSystemResource;\r
\r
-public class SlcAntTest extends AbstractSpringTestCase {\r
+public class SlcAntTest extends MinimalAntClasspathTestCase {\r
// private Log log = LogFactory.getLog(getClass());\r
\r
public void testSimpleRun() {\r
- AntSlcApplication slcApp = new AntSlcApplication();\r
- slcApp.setRootDir(new FileSystemResource(new File("src/test/resources")\r
- .getAbsolutePath()\r
- + File.separator));\r
- slcApp.setWorkDir(new File(System.getProperty("java.io.tmpdir")));\r
- slcApp.setParentContext(getContext());\r
-\r
- SlcExecution slcExecution = new SlcExecution();\r
- slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_FILE,\r
- "/org/argeo/slc/ant/build.xml");\r
-\r
- slcApp.execute(slcExecution, null, null, null);\r
+ execute("/org/argeo/slc/ant/build.xml");\r
}\r
-\r
}\r
+++ /dev/null
-package org.argeo.slc.ws;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-import org.argeo.slc.unit.AbstractSpringTestCase;\r
-\r
-public class SlcAntWsIntegrationTest extends AbstractSpringTestCase {\r
- private Log log = LogFactory.getLog(getClass());\r
-\r
- public void testSimpleRun() {\r
- fail("Adapt to new runtime");\r
- // AntRegistryUtil.runAll(getClass().getResource(\r
- // "/org/argeo/slc/ant/build.xml"), "test", null);\r
-\r
- // URL url = getClass().getResource("/org/argeo/slc/ant/build.xml");\r
- // log.info("Run Ant file from URL: " + url);\r
- // AntRunner antRunner = new AntRunner(getContext(), url, "test");\r
- //\r
- // antRunner.run();\r
- }\r
-\r
-}\r
+++ /dev/null
-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);
- }
-}
+++ /dev/null
-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);
- }
-}
+++ /dev/null
-<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
-<!-- TODO: remove this file\r
- <import\r
- resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
- <import\r
- resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
--->\r
-</beans>\r
+++ /dev/null
-<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/ws/client/spring/applicationContext.xml" />\r
- <import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />\r
- <import resource="execution.xml" />\r
- <import resource="result.xml" />\r
-\r
-</beans>\r
+++ /dev/null
-<?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/ws/client/spring/applicationContext.xml" />\r
-\r
- <bean name="executionBuildListener"\r
- class="org.argeo.slc.ant.SlcExecutionBuildListener">\r
- <property name="notifiers">\r
- <list>\r
- <ref bean="slcDefault.ws.client.slcExecutionNotifier" />\r
- </list>\r
- </property>\r
- </bean>\r
-\r
- <bean name="fileNotifier"\r
- class="org.argeo.slc.core.process.FileSlcExecutionNotifier">\r
- <property name="basePath" value="${slc.workDir}/process" />\r
- <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
- </bean>\r
-\r
-</beans>
\ No newline at end of file
+++ /dev/null
-<?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/ws/client/spring/applicationContext.xml" />\r
-\r
- <bean id="testResult"\r
- parent="slcDefault.test.basicTreeTestResult">\r
- <property name="listeners">\r
- <list merge="true">\r
- <ref\r
- bean="slcDefault.ws.client.treeTestResultWsNotfier" />\r
- <ref bean="slcDefault.castor.xsltReportGenerator" />\r
- </list>\r
- </property>\r
- </bean>\r
-\r
-</beans>
\ No newline at end of file