Add tests to increase test coverage

Signed-off-by: nxhafa <nxhafa11@gmail.com>

Author: nxhafa

caching-service/src/main/java/org/zowe/apiml/caching/service/infinispan/config/InfinispanConfig.java

@@ -138,10 +138,13 @@ static String getRootFolder() {
         }
     }
 
+    public String getInfinispanConfigFile() {
+        return isServerAttlsEnabled ? "infinispan-attls.xml" : "infinispan.xml";
+    }
+
     private ConfigurationBuilderHolder getCacheManagerConfig(ResourceLoader resourceLoader) {
         ConfigurationBuilderHolder holder;
-        var infinispanConfigFile = isServerAttlsEnabled ? "infinispan-attls.xml" : "infinispan.xml";
-        try (InputStream configurationStream = resourceLoader.getResource("classpath:" + infinispanConfigFile).getInputStream()) {
+        try (InputStream configurationStream = resourceLoader.getResource("classpath:" + getInfinispanConfigFile()).getInputStream()) {
             holder = new ParserRegistry().parse(configurationStream, MediaType.APPLICATION_XML);
         } catch (IOException e) {
             throw new InfinispanConfigException("Can't read configuration file", e);

caching-service/src/test/java/org/zowe/apiml/caching/service/infinispan/config/InfinispanConfigTest.java

@@ -57,6 +57,35 @@ void whenKeystore_thenDontUpdate() {
             assertEquals("pass", ReflectionTestUtils.getField(infinispanConfig, "keyStorePass"));
         }
 
+        @Test
+        void whenTruststoreKeyringUrlIsInvalidAndMissingPassword_thenFixTrustoreKeyringUrlAndSetPassword() {
+            InfinispanConfig infinispanConfig = new InfinispanConfig();
+            ReflectionTestUtils.setField(infinispanConfig, "trustStore", "safkeyringpce:///userId/ringId");
+            infinispanConfig.updateKeyring();
+            assertEquals("safkeyringpce://userId/ringId", ReflectionTestUtils.getField(infinispanConfig, "trustStore"));
+            assertEquals("password", ReflectionTestUtils.getField(infinispanConfig, "trustStorePass"));
+        }
+
+        @Test
+        void whenTruststoreKeyringUrlIsInvalidAndSetPassword_thenFixTruststoreKeyringUrl() {
+            InfinispanConfig infinispanConfig = new InfinispanConfig();
+            ReflectionTestUtils.setField(infinispanConfig, "trustStore", "safkeyring:///userId/ringId");
+            ReflectionTestUtils.setField(infinispanConfig, "trustStorePass", "pswd");
+            infinispanConfig.updateKeyring();
+            assertEquals("safkeyring://userId/ringId", ReflectionTestUtils.getField(infinispanConfig, "trustStore"));
+            assertEquals("pswd", ReflectionTestUtils.getField(infinispanConfig, "trustStorePass"));
+        }
+
+        @Test
+        void whenTruststore_thenDontUpdate() {
+            InfinispanConfig infinispanConfig = new InfinispanConfig();
+            ReflectionTestUtils.setField(infinispanConfig, "trustStore", "/path");
+            ReflectionTestUtils.setField(infinispanConfig, "trustStorePass", "pass");
+            infinispanConfig.updateKeyring();
+            assertEquals("/path", ReflectionTestUtils.getField(infinispanConfig, "trustStore"));
+            assertEquals("pass", ReflectionTestUtils.getField(infinispanConfig, "trustStorePass"));
+        }
+
     }
 
     @Nested
@@ -93,15 +122,13 @@ void givenNoEnvironmentValues_whenEvaluatingRootFolder_thenUseLocalhost() {
         void givenOnlyInstanceIdValues_whenEvaluatingRootFolder_thenUseRelativePath() {
             getEnvMap().put(INSTANCE, "myInstance");
             assertEquals("caching-service" + File.separator + "myInstance", InfinispanConfig.getRootFolder());
-
         }
 
         @Test
         void givenAllEnvironmentValues_whenEvaluatingRootFolder_thenUseExactLocation() {
             getEnvMap().put(INSTANCE, "lpar1");
             getEnvMap().put(WORKSPACE, "/some/path");
             assertEquals(File.separator + "some" + File.separator + "path" + File.separator + "caching-service" + File.separator + "lpar1", InfinispanConfig.getRootFolder());
-
         }
 
         @Test
@@ -111,6 +138,11 @@ void givenOnlyWorkspaceValues_whenEvaluatingRootFolder_thenUseExactLocationWithL
 
         }
 
+        @Test
+        void givenNoAttlsSetup_whenEvaluatingInfinispanConfigFile_thenReturnSslConfig() {
+            assertEquals("infinispan.xml", new InfinispanConfig().getInfinispanConfigFile());
+        }
+
     }
 
 }