X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.example%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fexample%2Fjunit%2FContextIntegrationTest.java;h=3dfe4cfdfde4aa096a04607245531430208ec51e;hb=39aba651ee1e941262b17e9c6deb7ef009093beb;hp=f7f69bc62ebe335b647ec4019aae29deb12667c2;hpb=0299080aa6b38c28e68325fc681fbec0ff2f1c79;p=gpl%2Fargeo-slc.git

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 f7f69bc62..3dfe4cfdf 100644
--- 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;
 
 import junit.framework.TestCase;
 
-import org.springframework.context.ApplicationContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.Project;
-
 import org.argeo.slc.ant.AntRegistryUtil;
-import org.argeo.slc.ant.SlcProjectHelper;
-import org.argeo.slc.core.test.NumericTRId;
+import org.argeo.slc.ant.SlcAntConstants;
 import org.argeo.slc.core.test.TestStatus;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.TestResultDao;
 import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
+import org.springframework.context.ApplicationContext;
 
 public class ContextIntegrationTest extends TestCase {
 	private static Log log = LogFactory.getLog(ContextIntegrationTest.class);
@@ -25,10 +22,8 @@ public class ContextIntegrationTest extends TestCase {
 		TestResultDao<TreeTestResult> testResultDao = runAnt(
 				"root/Context/build.xml", null);
 
-		NumericTRId numericTRId = new NumericTRId();
-		numericTRId.setValue(1l);
 		TreeTestResult testResult1 = (TreeTestResult) testResultDao
-				.getTestResult(numericTRId);
+				.getTestResult("1");
 
 		String basePath = "/root/Context/testContext/";
 		UnitTestTreeUtil.assertPart(testResult1, basePath
@@ -37,9 +32,8 @@ public class ContextIntegrationTest extends TestCase {
 		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/var", 0,
+				TestStatus.PASSED, "Values matched for key 'var'");
 		UnitTestTreeUtil.assertPart(testResult1, basePath
 				+ "slc.test1/varIntern", 0, TestStatus.PASSED,
 				"Values matched for key 'varIntern'");
@@ -56,10 +50,8 @@ public class ContextIntegrationTest extends TestCase {
 		TestResultDao<TreeTestResult> testResultDao = runAnt(
 				"root/Context/build.xml", "testBaseContext");
 
-		NumericTRId numericTRId = new NumericTRId();
-		numericTRId.setValue(1l);
 		TreeTestResult testResult1 = (TreeTestResult) testResultDao
-				.getTestResult(numericTRId);
+				.getTestResult("1");
 
 		String basePath = "/root/Context/testBaseContext/";
 		UnitTestTreeUtil.assertPart(testResult1, basePath
@@ -85,7 +77,7 @@ public class ContextIntegrationTest extends TestCase {
 		Project p = AntRegistryUtil.runAll(antFile, target);
 
 		ApplicationContext context = (ApplicationContext) p
-				.getReference(SlcProjectHelper.REF_ROOT_CONTEXT);
+				.getReference(SlcAntConstants.REF_ROOT_CONTEXT);
 
 		TestResultDao<TreeTestResult> testResultDao = (TestResultDao<TreeTestResult>) context
 				.getBean("testResultDao");