Introduce automated integration tests on the web app

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / test / java / org / argeo / slc / ant / SlcAntTest.java

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 c49fcc74fc53b613944658989bae6ec4bedbdd1b..9cfa214223575e109daae75322f7bad224f8868e 100644 (file)
--- 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
@@ -1,40 +1,16 @@
 package org.argeo.slc.ant;\r
 \r
 import java.io.File;\r
-import java.net.URL;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
 \r
+import org.argeo.slc.ant.unit.MinimalAntClasspathTestCase;\r
 import org.argeo.slc.core.process.SlcExecution;\r
-import org.argeo.slc.runtime.SimpleSlcRuntime;\r
 import org.argeo.slc.unit.AbstractSpringTestCase;\r
 import org.springframework.core.io.FileSystemResource;\r
 \r
-public class SlcAntTest extends AbstractSpringTestCase {\r
-       private Log log = LogFactory.getLog(getClass());\r
+public class SlcAntTest extends MinimalAntClasspathTestCase {\r
+       // private Log log = LogFactory.getLog(getClass());\r
 \r
        public void testSimpleRun() {\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
-\r
-               // AntRunner antRunner = new AntRunner(getContext(), url, "test");\r
-               // antRunner.run();\r
-\r
-               AntSlcApplication slcApp = new AntSlcApplication();\r
-               slcApp.setSlcRuntime(new SimpleSlcRuntime(getContext()));\r
-               slcApp.setRootDir(new FileSystemResource(new File("src/test/resources")\r
-                               .getAbsolutePath()\r
-                               + File.separator));\r
-\r
-               SlcExecution slcExecution = new SlcExecution();\r
-               slcExecution.getAttributes().put(SlcAntConstants.EXECATTR_ANT_FILE,\r
-                               url.toString());\r
-\r
-               slcApp.execute(slcExecution, null, null);\r
+               execute("/org/argeo/slc/ant/build.xml");\r
        }\r
-\r
 }\r