test(core): add extension of 'AuthenticatedEncryptionPendingRequestIdGenerationStrategy' that allows generation of already expired tokens

2 files changed, 51 insertions, 37 deletions

diff --git a/eaaf_core/src/test/resources/SpringTest-context_authManager.xml b/eaaf_core/src/test/resources/SpringTest-context_authManager.xml
index d7b148d0..faec351d 100644
--- a/eaaf_core/src/test/resources/SpringTest-context_authManager.xml
+++ b/eaaf_core/src/test/resources/SpringTest-context_authManager.xml
@@ -9,43 +9,7 @@
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-  <import resource="classpath:/spring/eaaf_utils.beans.xml"/>
-
-  <bean id="TestAuthenticationDataBuilder"
-    class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder" />
-
-  <bean id="dummyAuthManager"
-    class="at.gv.egiz.eaaf.core.impl.idp.auth.DummyAuthManager" />
-
-  <bean id="dummyRevisionLogger"
-    class="at.gv.egiz.eaaf.core.impl.logging.DummyRevisionsLogger" />
-
-  <bean id="DummyProtocolAuthService"
-    class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyProtocolAuthService" />
-
-  <bean id="DummyTransactionStorage"
-    class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.DummyTransactionStorage" />
-
-  <bean id="DummyStatusMessager"
-    class="at.gv.egiz.eaaf.core.impl.logging.DummyStatusMessager" />
-
-  <bean id="springElAwareExpressionEvaluator"
-    class="at.gv.egiz.eaaf.core.impl.idp.process.spring.SpringExpressionEvaluator" />
-
-  <bean id="processEngine"
-    class="at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl">
-    <property name="transitionConditionExpressionEvaluator"
-      ref="springElAwareExpressionEvaluator" />
-  </bean>
-
-  <bean id="moduleRegistration"
-    class="at.gv.egiz.eaaf.core.impl.idp.auth.modules.ModuleRegistration" />
-
-  <bean id="ProcessInstanceStoreage"
-    class="at.gv.egiz.eaaf.core.impl.idp.process.dao.ProcessInstanceStoreDaoImpl" />
-
-  <bean id="RequestStorage"
-    class="at.gv.egiz.eaaf.core.impl.idp.auth.RequestStorage" />
+  <import resource="classpath:/SpringTest-context_authManager_without_pendingReqGeneration.xml"/>
 
   <bean id="simplePendingRequestIdGenerationStrategy"
     class="at.gv.egiz.eaaf.core.impl.utils.SimplePendingRequestIdGenerationStrategy" />
diff --git a/eaaf_core/src/test/resources/SpringTest-context_authManager_without_pendingReqGeneration.xml b/eaaf_core/src/test/resources/SpringTest-context_authManager_without_pendingReqGeneration.xml
new file mode 100644
index 00000000..5ed5dde8
--- /dev/null
+++ b/eaaf_core/src/test/resources/SpringTest-context_authManager_without_pendingReqGeneration.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  <import resource="classpath:/spring/eaaf_utils.beans.xml"/>
+
+  <bean id="TestAuthenticationDataBuilder"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder" />
+
+  <bean id="dummyAuthManager"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.DummyAuthManager" />
+
+  <bean id="dummyRevisionLogger"
+    class="at.gv.egiz.eaaf.core.impl.logging.DummyRevisionsLogger" />
+
+  <bean id="DummyProtocolAuthService"
+    class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyProtocolAuthService" />
+
+  <bean id="DummyTransactionStorage"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.DummyTransactionStorage" />
+
+  <bean id="DummyStatusMessager"
+    class="at.gv.egiz.eaaf.core.impl.logging.DummyStatusMessager" />
+
+  <bean id="springElAwareExpressionEvaluator"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.spring.SpringExpressionEvaluator" />
+
+  <bean id="processEngine"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl">
+    <property name="transitionConditionExpressionEvaluator"
+      ref="springElAwareExpressionEvaluator" />
+  </bean>
+
+  <bean id="moduleRegistration"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.modules.ModuleRegistration" />
+
+  <bean id="ProcessInstanceStoreage"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.dao.ProcessInstanceStoreDaoImpl" />
+
+  <bean id="RequestStorage"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.RequestStorage" />
+
+</beans>