Restructure example unit tests

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

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
index f7f69bc62ebe335b647ec4019aae29deb12667c2..3dfe4cfdfde4aa096a04607245531430208ec51e 100644 (file)
--- 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
@@ -4,19 +4,16 @@ 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.test.NumericTRId;\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
@@ -25,10 +22,8 @@ public class ContextIntegrationTest extends TestCase {
                TestResultDao<TreeTestResult> testResultDao = runAnt(\r
                                "root/Context/build.xml", null);\r
 \r
-               NumericTRId numericTRId = new NumericTRId();\r
-               numericTRId.setValue(1l);\r
                TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
-                               .getTestResult(numericTRId);\r
+                               .getTestResult("1");\r
 \r
                String basePath = "/root/Context/testContext/";\r
                UnitTestTreeUtil.assertPart(testResult1, basePath\r
@@ -37,9 +32,8 @@ public class ContextIntegrationTest extends TestCase {
                UnitTestTreeUtil.assertPart(testResult1, basePath\r
                                + "slc.test1/reference2", 0, TestStatus.PASSED,\r
                                "Values matched for key 'reference2'");\r
-               UnitTestTreeUtil.assertPart(testResult1, basePath\r
-                               + "slc.test1/var", 0, TestStatus.PASSED,\r
-                               "Values matched for key 'var'");\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
@@ -56,10 +50,8 @@ public class ContextIntegrationTest extends TestCase {
                TestResultDao<TreeTestResult> testResultDao = runAnt(\r
                                "root/Context/build.xml", "testBaseContext");\r
 \r
-               NumericTRId numericTRId = new NumericTRId();\r
-               numericTRId.setValue(1l);\r
                TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
-                               .getTestResult(numericTRId);\r
+                               .getTestResult("1");\r
 \r
                String basePath = "/root/Context/testBaseContext/";\r
                UnitTestTreeUtil.assertPart(testResult1, basePath\r
@@ -85,7 +77,7 @@ public class ContextIntegrationTest extends TestCase {
                Project p = AntRegistryUtil.runAll(antFile, target);\r
 \r
                ApplicationContext context = (ApplicationContext) p\r
-                               .getReference(SlcProjectHelper.REF_ROOT_CONTEXT);\r
+                               .getReference(SlcAntConstants.REF_ROOT_CONTEXT);\r
 \r
                TestResultDao<TreeTestResult> testResultDao = (TestResultDao<TreeTestResult>) context\r
                                .getBean("testResultDao");\r