Introduce context at ant level

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

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml b/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
index f8a24099884ff16ce904de722a2545a862cdd3ac..8a658dda69598e5869938d2b60498cd0e84a591e 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
@@ -7,4 +7,5 @@
        <import resource="slc.xml" />\r
        <import resource="testDatas.xml" />\r
        <import resource="testDefinitions.xml" />\r
+       <import resource="contextTests.xml" />\r
 </beans>
\ No newline at end of file

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/contextTests.xml b/org.argeo.slc.example/exampleSlcAppli/conf/contextTests.xml
new file mode 100644 (file)
index 0000000..440c6b8
--- /dev/null
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/contextTests.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
+\r
+\r
+       <bean id="context.simple1" parent="context.template">\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="reference" value="20" />\r
+                               <entry key="varIntern" value="60" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="21" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+       \r
+       <bean id="context.simple2" parent="context.template">\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="var" value="50" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="21" />\r
+                               <entry key="var" value="50" />\r
+                               <entry key="varIntern" value="60" />\r
+                               <entry key="varExtern" value="70" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+       \r
+       <bean id="context.template"\r
+               class="org.argeo.slc.core.test.context.DefaultContextTestData"\r
+               abstract="true">\r
+       </bean>\r
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties b/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
index b92b4cca706aee6a4cdaea54bcbf9f44b17230cb..783bc06991c5bf6586292fa34da3c3c4a18e4102 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=INFO, console
 \r
 ## Levels\r
 # Slc\r
-log4j.logger.org.argeo.slc=TRACE\r
+log4j.logger.org.argeo.slc=INFO\r
 # Spring\r
 log4j.logger.org.springframework=INFO\r
 # Hibernate\r

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/testDefinitions.xml b/org.argeo.slc.example/exampleSlcAppli/conf/testDefinitions.xml
index 2522d280f01e3d275b48ae064200f14ce5b4ae28..8d7387d19c864ef1d424b6b096f586e397a069ac 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/testDefinitions.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/testDefinitions.xml
@@ -8,6 +8,11 @@
                scope="prototype">\r
        </bean>\r
 \r
+       <bean id="simpleContextTestDef"\r
+               class="org.argeo.slc.example.ContextExampleTestDef"\r
+               scope="prototype">\r
+       </bean>\r
+\r
        <bean id="complexExampleTestDef"\r
                class="org.argeo.slc.core.test.tree.CompositeTreeTestDefinition "\r
                scope="prototype">\r

diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
index 27780d31610ccebcf28879547929c56a99f9d4fd..d27ad20fcf8c17f3e28370a0b042afd95edd907f 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
@@ -1,9 +1,9 @@
 <project default="test" name="testProject">\r
        <description>A Test project</description>\r
 \r
-       <import file="complex.xml"/>\r
-       \r
-       <target name="test" depends="testSimple,testComplex,testError">\r
+       <import file="complex.xml" />\r
+\r
+       <target name="test" depends="testSimple,testComplex,testError,testContext">\r
                <slc.closeResult result="testResult" />\r
                <slc.closeResult result="testResult2" />\r
                <slc.report report="report" />\r
@@ -13,7 +13,7 @@
                <slc.test description="NATO">\r
                        <testDefinition bean="simpleExampleTestDef" />\r
                        <testData bean="testData.nato" />\r
-                       <structureElement bean="sElement.nato"/>\r
+                       <structureElement bean="sElement.nato" />\r
                </slc.test>\r
 \r
                <slc.test description="UN">\r

diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml
index 57c39e586a5e3dacdc4c9ed7cc5ed0a5da155581..88cbf3fad225168366f5008508a3eea044d24f93 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml
@@ -19,5 +19,30 @@
                </slc.test>\r
        </target>\r
 \r
+       <target name="testContext" description="Tests with context">\r
+               <slc.context id="context1">\r
+                       <values>\r
+                               <entry key="varExtern" value="70" />\r
+                       </values>\r
+                       <expectedValues>\r
+                               <entry key="reference" value="20" />\r
+                       </expectedValues>\r
+               </slc.context>\r
+\r
+               <slc.test description="Context 1">\r
+                       <testDefinition bean="simpleContextTestDef" />\r
+                       <testData bean="context.simple1">\r
+                               <override name="parentContext" antref="context1" />\r
+                       </testData>\r
+               </slc.test>\r
+\r
+               <slc.test description="Context 2">\r
+                       <testDefinition bean="simpleContextTestDef" />\r
+                       <testData bean="context.simple2">\r
+                               <override name="parentContext" antref="context1" />\r
+                       </testData>\r
+               </slc.test>\r
+       </target>\r
+\r
 \r
 </project>
\ No newline at end of file

diff --git a/org.argeo.slc.example/pom.xml b/org.argeo.slc.example/pom.xml
index c1e7c66a012d64a332b80887933991d99850acfc..1ce16aea0d75e470aa9e95f512ec81361c9db5f7 100644 (file)
--- a/org.argeo.slc.example/pom.xml
+++ b/org.argeo.slc.example/pom.xml
@@ -6,7 +6,7 @@
        <parent>\r
                <groupId>org.argeo.slc</groupId>\r
                <artifactId>argeo-slc</artifactId>\r
-               <version>0.8.1</version>\r
+               <version>0.8-SNAPSHOT</version>\r
                <relativePath>../org.argeo.slc</relativePath>\r
        </parent>\r
        <artifactId>argeo-slc-example</artifactId>\r

diff --git a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java
new file mode 100644 (file)
index 0000000..7fec8e7
--- /dev/null
+++ b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java
@@ -0,0 +1,24 @@
+package org.argeo.slc.example;\r
+\r
+import org.argeo.slc.core.structure.SimpleSElement;\r
+import org.argeo.slc.core.structure.StructureElement;\r
+import org.argeo.slc.core.structure.tree.TreeSRelatedHelper;\r
+import org.argeo.slc.core.test.TestDefinition;\r
+import org.argeo.slc.core.test.TestRun;\r
+import org.argeo.slc.core.test.context.ContextUtils;\r
+import org.argeo.slc.core.test.context.DefaultContextTestData;\r
+\r
+public class ContextExampleTestDef extends TreeSRelatedHelper implements\r
+               TestDefinition {\r
+\r
+       public void execute(TestRun testRun) {\r
+               DefaultContextTestData data = testRun.getTestData();\r
+               ContextUtils\r
+                               .compareReachedExpected(data, testRun.getTestResult(), this);\r
+       }\r
+\r
+       public StructureElement getStructureElement(String key) {\r
+               return new SimpleSElement(key);\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
index 592d228d8a9a6b0fa8426272514bff42fab74ef3..cdc8fd59654cb83a17d613ae1b8d7c44bf02cca7 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
@@ -25,8 +25,8 @@ public class ExampleIntegrationTest extends TestCase {
        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
@@ -65,6 +65,17 @@ public class ExampleIntegrationTest extends TestCase {
                                "/root/Category1/SubCategory2/testError/slc.test0", 0,\r
                                TestStatus.ERROR, "Execute example appli");\r
 \r
+               // Context\r
+               assertPart(testResult1,\r
+                               "/root/Category1/SubCategory2/testContext/slc.test1/reference",\r
+                               0, TestStatus.PASSED, "Values matched for key 'reference'");\r
+               assertPart(testResult1,\r
+                               "/root/Category1/SubCategory2/testContext/slc.test1/varIntern",\r
+                               0, TestStatus.PASSED, "Values matched for key 'varIntern'");\r
+               assertPart(testResult1,\r
+                               "/root/Category1/SubCategory2/testContext/slc.test1/varExtern",\r
+                               0, TestStatus.PASSED, "Values matched for key 'varExtern'");\r
+\r
                numericTRId.setValue(2l);\r
                TreeTestResult testResult2 = (TreeTestResult) testResultDao\r
                                .getTestResult(numericTRId);\r