chore: improved testing for zaas client compatibility for both v1 and…

… v2 base urls (#2239) Signed-off-by: Amanda D'Errico <[email protected]>
zowe · Mar 30, 2022 · 70d5ecc · 70d5ecc
1 parent 4f44e35
commit 70d5ecc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReaderZaasClient.java b/integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReaderZaasClient.java
@@ -13,7 +13,6 @@
 import org.zowe.apiml.zaasclient.config.ConfigProperties;
 
 import static org.zowe.apiml.util.config.ConfigReader.environmentConfiguration;
-import static org.zowe.apiml.util.requests.Endpoints.*;
 
 @Slf4j
 public class ConfigReaderZaasClient {
@@ -25,7 +24,7 @@ public static ConfigProperties getConfigProperties() {
 
             configProperties.setApimlHost(environmentConfiguration().getGatewayServiceConfiguration().getHost());
             configProperties.setApimlPort(environmentConfiguration().getGatewayServiceConfiguration().getPort() + "");
-            configProperties.setApimlBaseUrl(ROUTED_AUTH);
+            configProperties.setApimlBaseUrl("/gateway/api/v1/auth");
             configProperties.setKeyStorePath(environmentConfiguration().getTlsConfiguration().getKeyStore());
             configProperties.setKeyStorePassword(environmentConfiguration().getTlsConfiguration().getKeyStorePassword());
             configProperties.setKeyStoreType(environmentConfiguration().getTlsConfiguration().getKeyStoreType());

diff --git a/...ent/src/test/java/org/zowe/apiml/zaasclient/service/internal/ZaasClientImplHttpTests.java b/...ent/src/test/java/org/zowe/apiml/zaasclient/service/internal/ZaasClientImplHttpTests.java
@@ -9,21 +9,23 @@
  * Copyright Contributors to the Zowe Project.
  */
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.zowe.apiml.zaasclient.config.ConfigProperties;
 import org.zowe.apiml.zaasclient.exception.ZaasConfigurationException;
 import org.zowe.apiml.zaasclient.service.ZaasClient;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class ZaasClientImplHttpTests {
-    @Test
-    void testHttpOnlyZaasClientCanBeCreated() throws ZaasConfigurationException {
+    @ParameterizedTest
+    @ValueSource(strings = {"/api/v1/gateway/auth", "/gateway/api/v1/auth"})
+    void testHttpOnlyZaasClientCanBeCreated(String baseUrl) throws ZaasConfigurationException {
         ConfigProperties configProperties = new ConfigProperties();
         configProperties.setHttpOnly(true);
         configProperties.setApimlHost("hostname");
         configProperties.setApimlPort("10010");
-        configProperties.setApimlBaseUrl("/gateway/api/v1/auth");
+        configProperties.setApimlBaseUrl(baseUrl);
         configProperties.setNonStrictVerifySslCertificatesOfServices(false);
         configProperties.setKeyStorePath("keystorePath");
         ZaasClient client = new ZaasClientImpl(configProperties);