From f79f734fc5dc1f51ff309c335d09d0c889f2fed5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 21 Jun 2008 17:53:09 +0000 Subject: [PATCH] Move example appli to the standard location git-svn-id: https://svn.argeo.org/slc/trunk@1273 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../main/slc}/conf/applicationContext.xml | 0 .../slc}/conf/environments/environments.xml | 0 .../main/slc}/conf/runtime/default.xml | 0 .../main/slc}/conf/slc.properties | 0 .../main/slc}/conf/test/contextTests.xml | 0 .../main/slc}/conf/test/testDatas.xml | 0 .../main/slc}/conf/test/testDefinitions.xml | 0 .../slc}/root/Category1/SubCategory2/build.xml | 0 .../root/Category1/SubCategory2/complex.xml | 0 .../slc}/root/Category1/slcLocal.properties | 0 .../main/slc}/root/Context/build.xml | 0 .../main/slc}/root/slcRoot.properties | 0 .../work/data/expected/eu-reform-expected.txt | 0 .../slc}/work/data/expected/nato-expected.txt | 0 .../slc}/work/data/expected/un-expected.txt | 0 .../main/slc}/work/data/input/eu-reform-in.txt | 0 .../main/slc}/work/data/input/nato-in.txt | 0 .../main/slc}/work/data/input/un-in.txt | 0 .../argeo/slc/example/appli/SlcMainTest.java | 5 +++-- .../slc/example/appli/SubCategory2Test.java | 17 +++++------------ .../slc/example/context/BaseContextTest.java | 10 ---------- .../argeo/slc/example/context/ContextTest.java | 10 ---------- 22 files changed, 8 insertions(+), 34 deletions(-) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/applicationContext.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/environments/environments.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/runtime/default.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/slc.properties (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/test/contextTests.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/test/testDatas.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/conf/test/testDefinitions.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/root/Category1/SubCategory2/build.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/root/Category1/SubCategory2/complex.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/root/Category1/slcLocal.properties (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/root/Context/build.xml (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/root/slcRoot.properties (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/work/data/expected/eu-reform-expected.txt (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/work/data/expected/nato-expected.txt (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/work/data/expected/un-expected.txt (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/work/data/input/eu-reform-in.txt (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/work/data/input/nato-in.txt (100%) rename org.argeo.slc.example/{exampleSlcAppli => src/main/slc}/work/data/input/un-in.txt (100%) diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml b/org.argeo.slc.example/src/main/slc/conf/applicationContext.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml rename to org.argeo.slc.example/src/main/slc/conf/applicationContext.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/environments/environments.xml b/org.argeo.slc.example/src/main/slc/conf/environments/environments.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/environments/environments.xml rename to org.argeo.slc.example/src/main/slc/conf/environments/environments.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml b/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml rename to org.argeo.slc.example/src/main/slc/conf/runtime/default.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/slc.properties b/org.argeo.slc.example/src/main/slc/conf/slc.properties similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/slc.properties rename to org.argeo.slc.example/src/main/slc/conf/slc.properties diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/test/contextTests.xml b/org.argeo.slc.example/src/main/slc/conf/test/contextTests.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/test/contextTests.xml rename to org.argeo.slc.example/src/main/slc/conf/test/contextTests.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/test/testDatas.xml b/org.argeo.slc.example/src/main/slc/conf/test/testDatas.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/test/testDatas.xml rename to org.argeo.slc.example/src/main/slc/conf/test/testDatas.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/test/testDefinitions.xml b/org.argeo.slc.example/src/main/slc/conf/test/testDefinitions.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/conf/test/testDefinitions.xml rename to org.argeo.slc.example/src/main/slc/conf/test/testDefinitions.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml b/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml rename to org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml b/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/complex.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml rename to org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/complex.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties b/org.argeo.slc.example/src/main/slc/root/Category1/slcLocal.properties similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties rename to org.argeo.slc.example/src/main/slc/root/Category1/slcLocal.properties diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Context/build.xml b/org.argeo.slc.example/src/main/slc/root/Context/build.xml similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/root/Context/build.xml rename to org.argeo.slc.example/src/main/slc/root/Context/build.xml diff --git a/org.argeo.slc.example/exampleSlcAppli/root/slcRoot.properties b/org.argeo.slc.example/src/main/slc/root/slcRoot.properties similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/root/slcRoot.properties rename to org.argeo.slc.example/src/main/slc/root/slcRoot.properties diff --git a/org.argeo.slc.example/exampleSlcAppli/work/data/expected/eu-reform-expected.txt b/org.argeo.slc.example/src/main/slc/work/data/expected/eu-reform-expected.txt similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/work/data/expected/eu-reform-expected.txt rename to org.argeo.slc.example/src/main/slc/work/data/expected/eu-reform-expected.txt diff --git a/org.argeo.slc.example/exampleSlcAppli/work/data/expected/nato-expected.txt b/org.argeo.slc.example/src/main/slc/work/data/expected/nato-expected.txt similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/work/data/expected/nato-expected.txt rename to org.argeo.slc.example/src/main/slc/work/data/expected/nato-expected.txt diff --git a/org.argeo.slc.example/exampleSlcAppli/work/data/expected/un-expected.txt b/org.argeo.slc.example/src/main/slc/work/data/expected/un-expected.txt similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/work/data/expected/un-expected.txt rename to org.argeo.slc.example/src/main/slc/work/data/expected/un-expected.txt diff --git a/org.argeo.slc.example/exampleSlcAppli/work/data/input/eu-reform-in.txt b/org.argeo.slc.example/src/main/slc/work/data/input/eu-reform-in.txt similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/work/data/input/eu-reform-in.txt rename to org.argeo.slc.example/src/main/slc/work/data/input/eu-reform-in.txt diff --git a/org.argeo.slc.example/exampleSlcAppli/work/data/input/nato-in.txt b/org.argeo.slc.example/src/main/slc/work/data/input/nato-in.txt similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/work/data/input/nato-in.txt rename to org.argeo.slc.example/src/main/slc/work/data/input/nato-in.txt diff --git a/org.argeo.slc.example/exampleSlcAppli/work/data/input/un-in.txt b/org.argeo.slc.example/src/main/slc/work/data/input/un-in.txt similarity index 100% rename from org.argeo.slc.example/exampleSlcAppli/work/data/input/un-in.txt rename to org.argeo.slc.example/src/main/slc/work/data/input/un-in.txt diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SlcMainTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SlcMainTest.java index cc76b4c7d..71fe0ff92 100644 --- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SlcMainTest.java +++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SlcMainTest.java @@ -1,13 +1,14 @@ package org.argeo.slc.example.appli; +import org.argeo.slc.ant.unit.SlcAntAppliTestCase; import org.argeo.slc.cli.SlcMain; import junit.framework.TestCase; -public class SlcMainTest extends TestCase { +public class SlcMainTest extends SlcAntAppliTestCase { public void testSimpleRunFromMain() { String[] args = { "--mode", "single", "--script", - "exampleSlcAppli/root/Category1/SubCategory2/build.xml", + getAbsoluteScript("/Category1/SubCategory2/build.xml"), "--runtime", "default" }; SlcMain.main(args); } diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java index 82e53cf67..b804b68d8 100644 --- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java +++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java @@ -1,22 +1,15 @@ package org.argeo.slc.example.appli; +import static org.argeo.slc.unit.test.tree.UnitTestTreeUtil.assertPart; + import org.argeo.slc.ant.AntExecutionContext; -import org.argeo.slc.cli.DefaultSlcRuntime; -import org.argeo.slc.cli.SlcMain; +import org.argeo.slc.ant.unit.SlcAntAppliTestCase; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.runtime.SlcExecutionOutput; -import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; - -import static org.argeo.slc.unit.test.tree.UnitTestTreeUtil.assertPart; - -import junit.framework.TestCase; -public class SubCategory2Test extends TestCase implements - SlcExecutionOutput { +public class SubCategory2Test extends SlcAntAppliTestCase { public void testSimpleRun() { - new DefaultSlcRuntime().executeScript( - "exampleSlcAppli/root/Category1/SubCategory2/build.xml", this); + execute("/Category1/SubCategory2/build.xml"); } public void postExecution(AntExecutionContext executionContext) { diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/BaseContextTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/BaseContextTest.java index 93275f548..1ce04a14a 100644 --- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/BaseContextTest.java +++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/BaseContextTest.java @@ -2,14 +2,10 @@ package org.argeo.slc.example.context; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.unit.SlcAntAppliTestCase; -import org.argeo.slc.cli.DefaultSlcRuntime; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.runtime.SlcExecutionOutput; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; -import junit.framework.TestCase; - public class BaseContextTest extends SlcAntAppliTestCase { public void testExecute() { execute("Context/build.xml", "testBaseContext"); @@ -28,10 +24,4 @@ public class BaseContextTest extends SlcAntAppliTestCase { + "slc.test1/varIntern", 0, TestStatus.PASSED, "Values matched for key 'varIntern'"); } - - @Override - protected String getRootDir() { - return "exampleSlcAppli/root"; - } - } diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/ContextTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/ContextTest.java index 39d15f110..c37eaecfe 100644 --- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/ContextTest.java +++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/ContextTest.java @@ -2,14 +2,10 @@ package org.argeo.slc.example.context; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.unit.SlcAntAppliTestCase; -import org.argeo.slc.cli.DefaultSlcRuntime; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.runtime.SlcExecutionOutput; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; -import junit.framework.TestCase; - public class ContextTest extends SlcAntAppliTestCase { public void testExecute() { execute("Context/build.xml"); @@ -36,10 +32,4 @@ public class ContextTest extends SlcAntAppliTestCase { + "slc.test1/greeting", 0, TestStatus.PASSED, "Values matched for key 'greeting'"); } - - @Override - protected String getRootDir() { - return "exampleSlcAppli/root"; - } - } -- 2.39.2