Various fixes so that SLC example works again

[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..78c4ecd36a437652d5125add554f25123eef1da2 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
@@ -25,10 +25,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 +35,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 +53,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