Introduce doItAgain skip until error

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

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
index 58fd790bff374a18bd50d791b2132f473488e288..3efbf746b2215946d33d92f8c917f2f526fa0988 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
@@ -20,8 +20,7 @@ public class DummyStep implements DetachedStep {
                JFrameOperator jFrameOperator = new JFrameOperator("HelloWorldSwing");
                JButtonOperator jButtonOperator = new JButtonOperator(jFrameOperator,
                                "Button");
-               String label = request.getProperties().getProperty(
-                               "jemmyTest.label");
+               String label = request.getProperties().getProperty("jemmyTest.label");
                JLabelOperator jLabelOperator = new JLabelOperator(jFrameOperator,
                                label);
 
@@ -34,8 +33,7 @@ public class DummyStep implements DetachedStep {
 
                DetachedAnswer answer = new DetachedAnswer(request,
                                "DummyStep passed!! textAfterPush=" + textAfterPush);
-               answer.getProperties().setProperty("jemmyTest.label",
-                               textAfterPush);
+               answer.getProperties().setProperty("jemmyTest.label", textAfterPush);
                return answer;
        }
 

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
index 19ce4494158cc77c73c660cb368e10d5c9bb1044..1a962228f350a22ea797632d9c2924c013f4d162 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
@@ -3,6 +3,8 @@
     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.0.xsd">
 
+    <import resource="classpath:/org/argeo/slc/detached/spring.xml" />
+
     <bean id="jemmyTest" class="org.argeo.slc.jemmytest.DummyStep">
     </bean>
 

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
index eeafbd0aae4a0e9ca35e2b3d6745610d383aa91c..2f5ae780b50258b6475308cc0473957a71ac44b0 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
@@ -12,7 +12,8 @@
     </bean>
 
     <bean id="detachedTestData1"
-        class="org.argeo.slc.lib.detached.DetachedTestData">
+        class="org.argeo.slc.lib.detached.DetachedTestData"
+        scope="prototype">
         <property name="values">
             <map>
                 <entry key="jemmyTest.label" value="Hello World" />
@@ -26,7 +27,8 @@
     </bean>
 
     <bean id="detachedTestData2"
-        class="org.argeo.slc.lib.detached.DetachedTestData">
+        class="org.argeo.slc.lib.detached.DetachedTestData"
+        scope="prototype">
         <property name="values">
             <map>
                 <entry key="jemmyTest.label" value="Pressed!!" />

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml
index 57f19500ba1aa31194b170b5de49ff3945e7cf28..62673d70cb48214664ad73d7b7f2ec667d2ed052 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml
@@ -1,6 +1,9 @@
 <project default="steps">
 
        <target name="steps">
+               <slc.detached action="slcDefault.detached.admin.openSession"
+                             client="driver" />
+
                <slc.test>
                        <testDefinition bean="detachedTestDef" />
                        <testData bean="detachedTestData1" />
@@ -9,6 +12,10 @@
                        <testDefinition bean="detachedTestDef" />
                        <testData bean="detachedTestData2" />
                </slc.test>
+
+               <slc.detached action="slcDefault.detached.admin.closeSession"
+                             client="driver" />
+
        </target>
 
        <property name="devBase" location="/home/mbaudier/dev/src" />