From 8b0e6296527b6239d3fda64efe1c858e1cca6e3c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 10 Dec 2019 09:13:43 +0100
Subject: some more jUnit test modifications

---
 .../auth/eidas/v2/test/EidasAuthenticationModulImplTest.java   | 10 ++++++++--
 .../src/test/resources/SpringTest-context_basic_test.xml       |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/test')

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasAuthenticationModulImplTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasAuthenticationModulImplTest.java
index f6a3ec2e..c66d8ec0 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasAuthenticationModulImplTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasAuthenticationModulImplTest.java
@@ -1,16 +1,20 @@
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.test;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -27,6 +31,7 @@ import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("/SpringTest-context_tasks_test.xml")
+@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
 public class EidasAuthenticationModulImplTest {
 
   @Autowired ModuleRegistration moduleReg; 
@@ -41,10 +46,11 @@ public class EidasAuthenticationModulImplTest {
    * jUnit class initializer.
    * 
    */
-  public static void classInitializer() {
+  @BeforeClass
+  public static void classInitializer() throws IOException {
     final String current = new java.io.File(".").toURI().toString();
     System.setProperty("eidas.ms.configuration", current + "../../basicConfig/default_config.properties");
-    
+
   }
   
   /**
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
index 7bf2282f..f1f13391 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
@@ -38,7 +38,7 @@
   <bean id="BasicMSSpecificNodeConfig"
     class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
     <constructor-arg
-      value="#{systemProperties['eidas.ms.configuration'] != null ? systemProperties['eidas.ms.configuration'] : 'file:/F:/Projekte/configs/ms_connector/default_config.properties' }" />
+      value="#{systemProperties['eidas.ms.configuration']}" />
   </bean>
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3