From fb9ed691edda82f33f7948e36aded2cbdc01c840 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 2 Oct 2008 12:43:29 +0000
Subject: [PATCH] Introduce doItAgain skip until error

git-svn-id: https://svn.argeo.org/slc/trunk@1682 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../src/main/java/org/argeo/slc/jemmytest/DummyStep.java   | 6 ++----
 .../src/main/resources/META-INF/spring/slc-detached.xml    | 2 ++
 .../src/main/slc/conf/applicationContext.xml               | 6 ++++--
 .../src/main/slc/root/jemmyTest/build.xml                  | 7 +++++++
 4 files changed, 15 insertions(+), 6 deletions(-)

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 58fd790bf..3efbf746b 100644
--- 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 19ce44941..1a962228f 100644
--- 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 eeafbd0aa..2f5ae780b 100644
--- 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 57f19500b..62673d70c 100644
--- 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" />
-- 
2.39.5