Remove old integration tests

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

diff --git a/integration-tests/org.argeo.slc.it.webapp/.classpath b/integration-tests/org.argeo.slc.it.webapp/.classpath
index 85438c4cfa09bf10aed027538591d42cd7670b5b..04257bbcb6fb43a5454dae149db0cc8ec1f3529c 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/.classpath
+++ b/integration-tests/org.argeo.slc.it.webapp/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="src" path="src/test/java"/>
+       <classpathentry kind="src" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ant/build.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ant/build.xml
new file mode 100644 (file)
index 0000000..35de7be
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ant/build.xml
@@ -0,0 +1,25 @@
+<project default="test">\r
+\r
+       <target name="test">\r
+               <echo message="Hello World!" />\r
+\r
+               <slc.test>\r
+                       <testDefinition bean="testDef" />\r
+                       <testData bean="testData1" />\r
+               </slc.test>\r
+\r
+               <slc.test>
+                       <testDefinition bean="testDef" />
+                       <testData bean="testData.context1" />
+               </slc.test>
+
+               <slc.test path="/testRoot/testContext">
+                       <testDefinition bean="testDef" />
+                       <testData bean="testData.context1" />
+               </slc.test>
+
+               <slc.closeResult>
+                       <result bean="testResult" />
+               </slc.closeResult>\r
+       </target>\r
+</project>
\ No newline at end of file

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ant/nonDepContext.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ant/nonDepContext.xml
new file mode 100644 (file)
index 0000000..56da88a
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ant/nonDepContext.xml
@@ -0,0 +1,42 @@
+<?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.5.xsd">\r
+\r
+       <import\r
+               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
+\r
+       <bean name="testDef"\r
+               class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />\r
+\r
+       <bean name="testData1"\r
+               class="org.argeo.slc.core.test.BasicTestData">\r
+               <property name="expected">\r
+                       <value>toto</value>\r
+               </property>\r
+               <property name="reached">\r
+                       <value>toto</value>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="testData.context1" 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
+                               <entry key="varIntern" value="60" />\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
+\r
+</beans>
\ No newline at end of file

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ws/applicationContext.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ws/applicationContext.xml
new file mode 100644 (file)
index 0000000..ee822d2
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/resources-old/org/argeo/slc/ws/applicationContext.xml
@@ -0,0 +1,27 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+       <import
+               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
+       <import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
+
+       <bean name="executionBuildListener"
+               class="org.argeo.slc.ant.SlcExecutionBuildListener">
+               <property name="notifiers">
+                       <list>
+                               <ref bean="slcDefault.ws.client.slcExecutionNotifier" />
+                       </list>
+               </property>
+       </bean>
+
+       <bean id="testResult"
+               parent="slcDefault.test.basicTreeTestResult">
+               <property name="listeners">
+                       <list merge="true">
+                               <ref
+                                       bean="slcDefault.ws.client.treeTestResultWsNotfier" />
+                       </list>
+               </property>
+       </bean>
+</beans>

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/build.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/build.xml
deleted file mode 100644 (file)
index 35de7be..0000000
--- a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<project default="test">\r
-\r
-       <target name="test">\r
-               <echo message="Hello World!" />\r
-\r
-               <slc.test>\r
-                       <testDefinition bean="testDef" />\r
-                       <testData bean="testData1" />\r
-               </slc.test>\r
-\r
-               <slc.test>
-                       <testDefinition bean="testDef" />
-                       <testData bean="testData.context1" />
-               </slc.test>
-
-               <slc.test path="/testRoot/testContext">
-                       <testDefinition bean="testDef" />
-                       <testData bean="testData.context1" />
-               </slc.test>
-
-               <slc.closeResult>
-                       <result bean="testResult" />
-               </slc.closeResult>\r
-       </target>\r
-</project>
\ No newline at end of file

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
deleted file mode 100644 (file)
index 56da88a..0000000
--- a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <bean name="testDef"\r
-               class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />\r
-\r
-       <bean name="testData1"\r
-               class="org.argeo.slc.core.test.BasicTestData">\r
-               <property name="expected">\r
-                       <value>toto</value>\r
-               </property>\r
-               <property name="reached">\r
-                       <value>toto</value>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="testData.context1" 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
-                               <entry key="varIntern" value="60" />\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
-\r
-</beans>
\ No newline at end of file

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml b/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
deleted file mode 100644 (file)
index ee822d2..0000000
--- a/integration-tests/org.argeo.slc.it.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <import
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
-       <import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
-
-       <bean name="executionBuildListener"
-               class="org.argeo.slc.ant.SlcExecutionBuildListener">
-               <property name="notifiers">
-                       <list>
-                               <ref bean="slcDefault.ws.client.slcExecutionNotifier" />
-                       </list>
-               </property>
-       </bean>
-
-       <bean id="testResult"
-               parent="slcDefault.test.basicTreeTestResult">
-               <property name="listeners">
-                       <list merge="true">
-                               <ref
-                                       bean="slcDefault.ws.client.treeTestResultWsNotfier" />
-                       </list>
-               </property>
-       </bean>
-</beans>