Restructure deployment

[gpl/argeo-slc.git] / org.argeo.slc.example / src / test / java / org / argeo / slc / example / junit / ExampleIntegrationTest.java

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
index 592d228d8a9a6b0fa8426272514bff42fab74ef3..c072a21be94ce6c7c4c721d61fe1c476aa549130 100644 (file)
--- 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
@@ -4,29 +4,24 @@ import java.io.File;
 \r
 import junit.framework.TestCase;\r
 \r
-import org.springframework.context.ApplicationContext;\r
-\r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
 import org.apache.tools.ant.Project;\r
-\r
 import org.argeo.slc.ant.AntRegistryUtil;\r
 import org.argeo.slc.ant.SlcProjectHelper;\r
-import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.test.NumericTRId;\r
-import org.argeo.slc.core.test.SimpleResultPart;\r
 import org.argeo.slc.core.test.TestStatus;\r
-import org.argeo.slc.core.test.tree.PartSubList;\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
+       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
@@ -46,49 +41,39 @@ public class ExampleIntegrationTest extends TestCase {
                TestResultDao testResultDao = (TestResultDao) context\r
                                .getBean("testResultDao");\r
 \r
-               NumericTRId numericTRId = new NumericTRId();\r
-               numericTRId.setValue(1l);\r
                TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
-                               .getTestResult(numericTRId);\r
+                               .getTestResult("1");\r
                // assertPart(testResult1, "", 0, TestStatus.PASSED, "");\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
-               assertPart(testResult1,\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
-               assertPart(testResult1,\r
+               UnitTestTreeUtil.assertPart(testResult1,\r
                                "/root/Category1/SubCategory2/testError/slc.test0", 0,\r
                                TestStatus.ERROR, "Execute example appli");\r
 \r
-               numericTRId.setValue(2l);\r
-               TreeTestResult testResult2 = (TreeTestResult) testResultDao\r
-                               .getTestResult(numericTRId);\r
-               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
-               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
+//             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
+//             assertTrue(new File(reportDirPath + "slc-result-2.html").exists());\r
        }\r
 \r
-       private void assertPart(TreeTestResult testResult, String pathStr,\r
-                       int index, Integer status, String message) {\r
-               TreeSPath path = TreeSPath.parseToCreatePath(pathStr);\r
-               PartSubList list = testResult.getResultParts().get(path);\r
-               SimpleResultPart part = (SimpleResultPart) list.getParts().get(index);\r
-               assertEquals(status, part.getStatus());\r
-               assertEquals(message, part.getMessage());\r
-       }\r
 }\r