Restructure example unit tests

git-svn-id: https://svn.argeo.org/slc/trunk@1270 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
deleted file mode 100644 (file)
index 4f5588e..0000000
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.argeo.slc.example;
-
-import org.argeo.slc.cli.SlcMain;
-
-import junit.framework.TestCase;
-
-public class ExecutionTest extends TestCase {
-       public void testSimpleRun() {
-               String[] args = { "--mode", "single", "--script",
-                               "exampleSlcAppli/root/Category1/SubCategory2/build.xml",
-                               "--runtime", "default" };
-               SlcMain.main(args);
-       }
-}

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
new file mode 100644 (file)
index 0000000..cc76b4c
--- /dev/null
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SlcMainTest.java
@@ -0,0 +1,15 @@
+package org.argeo.slc.example.appli;
+
+import org.argeo.slc.cli.SlcMain;
+
+import junit.framework.TestCase;
+
+public class SlcMainTest extends TestCase {
+       public void testSimpleRunFromMain() {
+               String[] args = { "--mode", "single", "--script",
+                               "exampleSlcAppli/root/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
new file mode 100644 (file)
index 0000000..82e53cf
--- /dev/null
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java
@@ -0,0 +1,43 @@
+package org.argeo.slc.example.appli;
+
+import org.argeo.slc.ant.AntExecutionContext;
+import org.argeo.slc.cli.DefaultSlcRuntime;
+import org.argeo.slc.cli.SlcMain;
+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<AntExecutionContext> {
+       public void testSimpleRun() {
+               new DefaultSlcRuntime().executeScript(
+                               "exampleSlcAppli/root/Category1/SubCategory2/build.xml", this);
+       }
+
+       public void postExecution(AntExecutionContext executionContext) {
+               TreeTestResult testResult1 = executionContext.getBean("testResult");
+               assertPart(testResult1,
+                               "/Category1/SubCategory2/testProject/testComplex/slc.test0/0",
+                               0, TestStatus.PASSED, null);
+               assertPart(testResult1,
+                               "/Category1/SubCategory2/testProject/testSimple/slc.test0", 1,
+                               TestStatus.FAILED, null);
+               assertPart(testResult1,
+                               "/Category1/SubCategory2/testProject/testError/slc.test0", 0,
+                               TestStatus.ERROR, null);
+
+               TreeTestResult testResult2 = executionContext.getBean("testResult2");
+               assertPart(testResult2,
+                               "/Category1/SubCategory2/testProject/testSimple/slc.test2", 1,
+                               TestStatus.PASSED, null);
+               assertPart(testResult2,
+                               "/Category1/SubCategory2/testProject/testSimple/slc.test3", 1,
+                               TestStatus.FAILED, null);
+       }
+
+}

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
new file mode 100644 (file)
index 0000000..93275f5
--- /dev/null
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/BaseContextTest.java
@@ -0,0 +1,37 @@
+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");
+       }
+
+       public void postExecution(AntExecutionContext executionContext) {
+               TreeTestResult testResult1 = executionContext.getBean("testResult");
+               String basePath = "/Context/project/testBaseContext/";
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test0/reference", 0, TestStatus.PASSED,
+                               "Values matched for key 'reference'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test1/reference", 0, TestStatus.PASSED,
+                               "Values matched for key 'reference'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "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
new file mode 100644 (file)
index 0000000..39d15f1
--- /dev/null
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/context/ContextTest.java
@@ -0,0 +1,45 @@
+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");
+       }
+
+       public void postExecution(AntExecutionContext executionContext) {
+               TreeTestResult testResult1 = executionContext.getBean("testResult");
+               String basePath = "/Context/project/testContext/";
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test0/reference", 0, TestStatus.PASSED,
+                               "Values matched for key 'reference'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test1/reference2", 0, TestStatus.PASSED,
+                               "Values matched for key 'reference2'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath + "slc.test1/var", 0,
+                               TestStatus.PASSED, "Values matched for key 'var'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test1/varIntern", 0, TestStatus.PASSED,
+                               "Values matched for key 'varIntern'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test1/varExtern", 0, TestStatus.PASSED,
+                               "Values matched for key 'varExtern'");
+               UnitTestTreeUtil.assertPart(testResult1, basePath
+                               + "slc.test1/greeting", 0, TestStatus.PASSED,
+                               "Values matched for key 'greeting'");
+       }
+
+       @Override
+       protected String getRootDir() {
+               return "exampleSlcAppli/root";
+       }
+
+}

diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java
deleted file mode 100644 (file)
index 3dfe4cf..0000000
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.argeo.slc.example.junit;\r
-\r
-import java.io.File;\r
-\r
-import junit.framework.TestCase;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-import org.apache.tools.ant.Project;\r
-import org.argeo.slc.ant.AntRegistryUtil;\r
-import org.argeo.slc.ant.SlcAntConstants;\r
-import org.argeo.slc.core.test.TestStatus;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.dao.test.TestResultDao;\r
-import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;\r
-import org.springframework.context.ApplicationContext;\r
-\r
-public class ContextIntegrationTest extends TestCase {\r
-       private static Log log = LogFactory.getLog(ContextIntegrationTest.class);\r
-\r
-       public void testContext() throws Exception {\r
-               TestResultDao<TreeTestResult> testResultDao = runAnt(\r
-                               "root/Context/build.xml", null);\r
-\r
-               TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
-                               .getTestResult("1");\r
-\r
-               String basePath = "/root/Context/testContext/";\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test0/reference", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'reference'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/reference2", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'reference2'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath + "slc.test1/var", 0,\r
-                               TestStatus.PASSED, "Values matched for key 'var'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/varIntern", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'varIntern'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/varExtern", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'varExtern'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/greeting", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'greeting'");\r
-\r
-       }\r
-\r
-       public void testBaseContext() throws Exception {\r
-               TestResultDao<TreeTestResult> testResultDao = runAnt(\r
-                               "root/Context/build.xml", "testBaseContext");\r
-\r
-               TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
-                               .getTestResult("1");\r
-\r
-               String basePath = "/root/Context/testBaseContext/";\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test0/reference", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'reference'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/reference", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'reference'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/varIntern", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'varIntern'");\r
-\r
-       }\r
-\r
-       private TestResultDao<TreeTestResult> runAnt(String antFileRelPath,\r
-                       String target) throws Exception {\r
-               String slcBase = System.getProperty("it.slc.base", "exampleSlcAppli");\r
-               File slcBaseDir = new File(slcBase).getCanonicalFile();\r
-               log.info("SLC base: " + slcBaseDir);\r
-\r
-               File antFile = new File(slcBaseDir.getPath() + File.separator\r
-                               + antFileRelPath);\r
-               Project p = AntRegistryUtil.runAll(antFile, target);\r
-\r
-               ApplicationContext context = (ApplicationContext) p\r
-                               .getReference(SlcAntConstants.REF_ROOT_CONTEXT);\r
-\r
-               TestResultDao<TreeTestResult> testResultDao = (TestResultDao<TreeTestResult>) context\r
-                               .getBean("testResultDao");\r
-               return testResultDao;\r
-\r
-       }\r
-}\r

diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
deleted file mode 100644 (file)
index 4d30e1a..0000000
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.argeo.slc.example.junit;\r
-\r
-import java.io.File;\r
-\r
-import junit.framework.TestCase;\r
-\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-import org.apache.tools.ant.Project;\r
-import org.argeo.slc.ant.AntRegistryUtil;\r
-import org.argeo.slc.ant.SlcAntConstants;\r
-import org.argeo.slc.core.test.TestStatus;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.dao.test.TestResultDao;\r
-import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;\r
-import org.springframework.context.ApplicationContext;\r
-\r
-/** High level tests for SLC Ant. */\r
-public class ExampleIntegrationTest extends TestCase {\r
-       private static Log log = LogFactory.getLog(ExampleIntegrationTest.class);\r
-\r
-       /** Tests an end-to-end Ant run. */\r
-       public void testAllRunSimple() throws Exception {\r
-               String slcBase = System.getProperty("it.slc.base", "exampleSlcAppli");\r
-               File slcBaseDir = new File(slcBase).getCanonicalFile();\r
-               log.info("SLC base: " + slcBaseDir);\r
-\r
-               String reportDirPath = slcBaseDir.getPath() + "/work/results/report/";\r
-               File[] reportFiles = new File(reportDirPath).listFiles();\r
-               for (File file : reportFiles) {\r
-                       file.delete();\r
-               }\r
-\r
-               File antFile = new File(slcBaseDir.getPath()\r
-                               + "/root/Category1/SubCategory2/build.xml");\r
-               Project p = AntRegistryUtil.runAll(antFile);\r
-\r
-               ApplicationContext context = (ApplicationContext) p\r
-                               .getReference(SlcAntConstants.REF_ROOT_CONTEXT);\r
-\r
-               TestResultDao testResultDao = (TestResultDao) context\r
-                               .getBean("testResultDao");\r
-\r
-               TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
-                               .getTestResult("1");\r
-               // assertPart(testResult1, "", 0, TestStatus.PASSED, "");\r
-               UnitTestTreeUtil\r
-                               .assertPart(\r
-                                               testResult1,\r
-                                               "/root/Category1/SubCategory2/testComplex/slc.test0/0",\r
-                                               0,\r
-                                               TestStatus.PASSED,\r
-                                               "Sub task with path /root/Category1/SubCategory2/testComplex/slc.test0/0 executed");\r
-               UnitTestTreeUtil.assertPart(testResult1,\r
-                               "/root/Category1/SubCategory2/testSimple/slc.test0", 1,\r
-                               TestStatus.FAILED,\r
-                               "Compare nato-expected.txt with nato-reached.txt");\r
-               UnitTestTreeUtil.assertPart(testResult1,\r
-                               "/root/Category1/SubCategory2/testError/slc.test0", 0,\r
-                               TestStatus.ERROR, "Execute example appli");\r
-\r
-//             TreeTestResult testResult2 = (TreeTestResult) testResultDao\r
-//                             .getTestResult("2");\r
-//             UnitTestTreeUtil.assertPart(testResult2,\r
-//                             "/root/Category1/SubCategory2/testSimple/slc.test2", 1,\r
-//                             TestStatus.PASSED,\r
-//                             "Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
-//             UnitTestTreeUtil.assertPart(testResult2,\r
-//                             "/root/Category1/SubCategory2/testSimple/slc.test3", 1,\r
-//                             TestStatus.FAILED,\r
-//                             "Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
-\r
-               assertTrue(new File(reportDirPath + "index.html").exists());\r
-               assertTrue(new File(reportDirPath + "slc-resultsList.html").exists());\r
-               assertTrue(new File(reportDirPath + "slc-result-1.html").exists());\r
-//             assertTrue(new File(reportDirPath + "slc-result-2.html").exists());\r
-       }\r
-\r
-}\r