1 files changed, 21 insertions, 9 deletions
diff --git a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/AbstractIntegrationTest.java b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/AbstractIntegrationTest.java
index 1c6e29a..1ee071a 100644
--- a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/AbstractIntegrationTest.java
+++ b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/AbstractIntegrationTest.java
@@ -83,22 +83,34 @@ public abstract class AbstractIntegrationTest {
     field8.set(null, null);
     
     // reset PKI module configuration
-    final Field field3 = PKIFactory.class.getDeclaredField("instance_");
-    field3.setAccessible(true);
-    field3.set(null, null);
+    resetClassState(PKIFactory.class, "instance_", null);
 
     // reset IAIK MOA configuration
-    final Field field4 = Configurator.class.getDeclaredField("C");
-    field4.setAccessible(true);
-    field4.set(null, false);
+    resetClassState(Configurator.class, "C", false);
     
     //reset ESI-SVA configuration
-    final Field field7 = ConfigurationAdapter.class.getDeclaredField("a");
-    field7.setAccessible(true);
-    field7.set(null, null);
+    resetClassState(ConfigurationAdapter.class, "a", null);
+    resetClassState(ConfigurationAdapter.class, "instance", null);
+    //resetClassState(ConfigurationAdapter.class, "config", null);
+    //resetClassState(ConfigurationAdapter.class, "libraryConfig", null);
     
   }
 
+  private static void resetClassState(Class clazz, String fieldName, Object value) {
+    try {
+      Field field7 = clazz.getDeclaredField(fieldName);
+      if (field7 != null) {
+        field7.setAccessible(true);
+        field7.set(null, value);       
+      }
+      
+    } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+      e.printStackTrace();
+    }
+    
+  }
+  
+  
   protected VerifyXMLSignatureRequest buildVerifyXmlRequest(final byte[] signature,
       final String trustProfileID, boolean extValFlag,
       final List<String> verifyTransformsInfoProfileID, final String xpathSignatureLocation,