X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcAntTest.java;h=17f8a60c50f5ef5b4aed09e6fa6efe56adbc04a6;hb=a26a4e7277526fe17e13652362821ac2a1fc273a;hp=4cbdb86cb6515338bc59b12f20dfb91a066bd8cf;hpb=80389feff3ab8e8743db4abfb6493285f72b24dd;p=gpl%2Fargeo-slc.git 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 4cbdb86cb..17f8a60c5 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 @@ -1,39 +1,24 @@ package org.argeo.slc.ant; import java.io.File; -import java.net.URL; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.runtime.SimpleSlcRuntime; import org.argeo.slc.unit.AbstractSpringTestCase; import org.springframework.core.io.FileSystemResource; public class SlcAntTest extends AbstractSpringTestCase { - private Log log = LogFactory.getLog(getClass()); +// private Log log = LogFactory.getLog(getClass()); public void testSimpleRun() { - // 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(); - AntSlcApplication slcApp = new AntSlcApplication(); - slcApp.setSlcRuntime(new SimpleSlcRuntime(getContext())); slcApp.setRootDir(new FileSystemResource(new File("src/test/resources") .getAbsolutePath() + File.separator)); - slcApp.init(); + slcApp.setParentContext(getContext()); SlcExecution slcExecution = new SlcExecution(); slcExecution.getAttributes().put(SlcAntConstants.EXECATTR_ANT_FILE, - url.toString()); + "/org/argeo/slc/ant/build.xml"); slcApp.execute(slcExecution, null, null); }