From f589b20e4e6eb5361430a7bfb26dfbe4c67c3d55 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 17 Feb 2016 12:20:50 +0100
Subject: refactor JUnit tests

---
 ...mpleProcessDefinitionForSAML1Authentication.xml | 12 +++++-----
 ...ingExpressionAwareProcessEngineTest-context.xml | 27 ++++++++++++++++++++++
 ...nvalidProcessDefinition_MultipleStartEvents.xml |  4 ++--
 .../InvalidProcessDefinition_NoStartEvents.xml     |  2 +-
 .../InvalidProcessDefinition_TransitionLoop.xml    |  2 +-
 ...dProcessDefinition_TransitionRefsTransition.xml |  2 +-
 ...cessDefinition_TransitionStartsFromEndEvent.xml |  2 +-
 .../id/process/test/SampleProcessDefinition1.xml   |  2 +-
 .../id/process/test/SampleProcessDefinition2.xml   |  4 ++--
 9 files changed, 42 insertions(+), 15 deletions(-)

(limited to 'id/server/idserverlib/src/test/resources')

diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml
index 764ad6405..6b84910bd 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml
@@ -5,37 +5,37 @@
 	<!--
 		returns String 'bkuURL'
 	-->
-	<pd:Task id="bkuSelectionTask" class="at.gv.egovernment.moa.id.process.spring.test.task.SelectBKUTask" />
+	<pd:Task id="bkuSelectionTask" class="SelectBKUTask" />
 
 	<!--
 		requires 'bkuURL'
 		returns String 'IdentityLink'
 	-->
-	<pd:Task id="getIdentityLinkTask" class="at.gv.egovernment.moa.id.process.spring.test.task.GetIdentityLinkTask" />
+	<pd:Task id="getIdentityLinkTask" class="GetIdentityLinkTask" />
 
 	<!--
 		requires 'IdentityLink'
 		returns Boolean 'isIdentityLinkValidated'
 	-->
-	<pd:Task id="validateIdentityLinkTask" class="at.gv.egovernment.moa.id.process.spring.test.task.ValidateIdentityLinkTask" />
+	<pd:Task id="validateIdentityLinkTask" class="ValidateIdentityLinkTask" />
 
 	<!--
 		requires 'IdentityLink', 'isIdentityLinkValidated', 'bkuURL'
 		returns String 'SignedAuthBlock'
 	-->
-	<pd:Task id="signAuthBlockTask" class="at.gv.egovernment.moa.id.process.spring.test.task.SignAuthBlockTask" />
+	<pd:Task id="signAuthBlockTask" class="SignAuthBlockTask" />
 
 	<!--
 		requires 'IdentityLink', 'isIdentityLinkValidated', 'SignedAuthBlock'
 		returns Boolean 'isSignedAuthBlockValidated'
 	-->
-	<pd:Task id="validateSignedAuthBlockTask" class="at.gv.egovernment.moa.id.process.spring.test.task.ValidateSignedAuthBlockTask" />
+	<pd:Task id="validateSignedAuthBlockTask" class="ValidateSignedAuthBlockTask" />
 	
 	<!--
 		requires 'IdentityLink', 'isIdentityLinkValidated', 'SignedAuthBlock', 'isSignedAuthBlockValidated';
 		returns 'SAML1Assertion'
 	-->
-	<pd:Task id="createAssertionTask" class="at.gv.egovernment.moa.id.process.spring.test.task.CreateSAML1AssertionTask" />
+	<pd:Task id="createAssertionTask" class="CreateSAML1AssertionTask" />
 
 	<pd:StartEvent id="start" />
 	<pd:EndEvent id="end" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml
index 9a381d83a..decdfe6b0 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml
@@ -10,4 +10,31 @@
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator" ref="springElAwareExpressionEvaluator" />
 	</bean>
+	
+	<bean id="ProcessInstanceStoreage" 
+				class="at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl"/>	
+	
+	<bean id="HelloWorldTask" 
+				class="at.gv.egovernment.moa.id.process.test.HelloWorldTask"/>
+	
+	<bean id="HalloWeltTask" 
+				class="at.gv.egovernment.moa.id.process.test.HalloWeltTask"/>
+				
+	<bean id="SelectBKUTask" 
+				class="at.gv.egovernment.moa.id.process.spring.test.task.SelectBKUTask"/>
+				
+	<bean id="CreateSAML1AssertionTask" 
+				class="at.gv.egovernment.moa.id.process.spring.test.task.CreateSAML1AssertionTask"/>
+
+	<bean id="GetIdentityLinkTask" 
+				class="at.gv.egovernment.moa.id.process.spring.test.task.GetIdentityLinkTask"/>
+
+	<bean id="SignAuthBlockTask" 
+				class="at.gv.egovernment.moa.id.process.spring.test.task.SignAuthBlockTask"/>
+				
+	<bean id="ValidateIdentityLinkTask" 
+				class="at.gv.egovernment.moa.id.process.spring.test.task.ValidateIdentityLinkTask"/>
+				
+	<bean id="ValidateSignedAuthBlockTask" 
+				class="at.gv.egovernment.moa.id.process.spring.test.task.ValidateSignedAuthBlockTask"/>																	
 </beans>
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml
index 17fa17cb4..2f492efa9 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml
@@ -7,8 +7,8 @@
 
 	<tns:StartEvent id="start1" />
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
-	<tns:Task id="task2" async="true" class="at.gv.egovernment.moa.id.process.test.HalloWeltTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
+	<tns:Task id="task2" async="true" class="HalloWeltTask" />
 	<tns:Task id="task3" />
 
 	<tns:StartEvent id="start2" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml
index 008309e3a..3a5b95273 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml
@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
 	<tns:Task id="task2" async="true" />
 
 	<tns:EndEvent id="end" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml
index 14b281192..541f7e2b8 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml
@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
 	<tns:Task id="task2" async="true" />
 
 	<tns:StartEvent id="start" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml
index 1152f3503..4b7a55e47 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml
@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
 	<tns:Task id="task2" async="true" />
 
 	<tns:StartEvent id="start" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
index 94bd25c9a..795990a19 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
 	<tns:Task id="task2" async="true" />
 
 	<tns:StartEvent id="start" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml
index c161900c5..a564485a3 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml
@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
 	<tns:Task id="task2" async="true" />
 
 	<tns:StartEvent id="start" />
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml
index 9e419e124..bf80f7935 100644
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml
@@ -7,8 +7,8 @@
 
 	<tns:StartEvent id="start" />
 
-	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
-	<tns:Task id="task2" async="true" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />
+	<tns:Task id="task1" class="HelloWorldTask" />
+	<tns:Task id="task2" async="true" class="HelloWorldTask" />
 	<tns:Task id="task3" />
 
 	<tns:EndEvent id="end" />
-- 
cgit v1.2.3