1 files changed, 0 insertions, 40 deletions
diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
index 5b6b8170..ed2e159b 100644
--- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
+++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
@@ -47,8 +47,6 @@ public class EaafKeyStoreFactoryTest {
   private static final String HSM_FACASE_SSL_TRUST = "src/test/resources/data/hsm_facade_trust_root.crt";
   private static final String HSM_FACASE_USERNAME = "authhandler-junit";
   private static final String HSM_FACASE_PASSWORD = "supersecret123";
-  private static final String HSM_FACASE_HSM_NAME = "software";
-
   private static final String PATH_TO_SOFTWARE_KEYSTORE_JKS_WITH_TRUSTED_CERTS =
       "src/test/resources/data/junit.jks";
   private static final String PATH_TO_SOFTWARE_KEYSTORE_JKS =
@@ -395,8 +393,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomNumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
 
     try {
       context.getBean(EaafKeyStoreFactory.class);
@@ -416,9 +412,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(4));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomNumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
-
     try {
       context.getBean(EaafKeyStoreFactory.class);
       Assert.fail("Missing HSM Facade not detected");
@@ -437,29 +430,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(4));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
-
-    try {
-      context.getBean(EaafKeyStoreFactory.class);
-      Assert.fail("Missing HSM Facade not detected");
-
-    } catch (final BeansException e) {
-      checkMissingConfigException(e);
-
-    }
-  }
-
-  @Test
-  public void hsmFacadeMissingKeyStoreName() {
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HOST,
-        RandomStringUtils.randomNumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_PORT,
-        RandomStringUtils.randomNumeric(4));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME,
-        RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
-        RandomStringUtils.randomAlphanumeric(10));
 
     try {
       context.getBean(EaafKeyStoreFactory.class);
@@ -481,8 +451,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
 
     try {
       context.getBean(EaafKeyStoreFactory.class);
@@ -504,8 +472,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST,
         "src/test/resources/data/notexist.crt");
 
@@ -529,8 +495,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST,
         "src/test/resources/spring/test_eaaf_pvp_lazy.beans.xml");
 
@@ -555,8 +519,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST,
         PATH_TO_HSM_FACADE_TRUST_CERT);
 
@@ -673,8 +635,6 @@ public class EaafKeyStoreFactoryTest {
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME, HSM_FACASE_USERNAME);
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD, HSM_FACASE_PASSWORD);
 
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME, HSM_FACASE_HSM_NAME);
-
   }
 
   private void checkMissingConfigException(Exception e) {