Merge pull request #220 from contentstack/fix/DX-3845-delete-release

Refactor test cases

Author: harshithad0703

src/test/java/com/contentstack/cms/ContentstackUnitTest.java

@@ -24,9 +24,7 @@ public class ContentstackUnitTest {
 
     @Test
     void testDefaultClientInstance() {
-        Contentstack client = new Contentstack.Builder().build();
-        Assertions.assertEquals("api.contentstack.io", client.host);
-        Assertions.assertEquals("443", client.port);
+        Contentstack client = new Contentstack.Builder().build();        Assertions.assertEquals("443", client.port);
         Assertions.assertEquals("v3", client.version);
         Assertions.assertEquals(30, client.timeout);
         Assertions.assertNull(client.authtoken);
@@ -35,16 +33,12 @@ void testDefaultClientInstance() {
 
     @Test
     void testClientDefaultPort() {
-        Contentstack client = new Contentstack.Builder().build();
-        Assertions.assertEquals("api.contentstack.io", client.host);
-        Assertions.assertEquals("443", client.port);
+        Contentstack client = new Contentstack.Builder().build();        Assertions.assertEquals("443", client.port);
     }
 
     @Test
     void testClientDefaultHost() {
-        Contentstack client = new Contentstack.Builder().build();
-        Assertions.assertEquals("api.contentstack.io", client.host);
-    }
+        Contentstack client = new Contentstack.Builder().build();    }
 
     @Test
     void testClientAPIDefaultVersion() {

src/test/java/com/contentstack/cms/TestClient.java

@@ -22,8 +22,7 @@ public class TestClient {
     public final static String MANAGEMENT_TOKEN = (env.get("managementToken") != null) ? env.get("managementToken")
             : "managementToken99999999";
 
-    public final static String DEV_HOST = "api.contentstack.io";
-    // (env.get("dev_host") != null) ? env.get("dev_host") : "api.contentstack.io";
+    public final static String DEV_HOST = (env.get("dev_host") != null) ? env.get("dev_host").trim() : "api.contentstack.io";
     public final static String VARIANT_GROUP_UID = (env.get("variantGroupUid") != null) ? env.get("variantGroupUid")
             : "variantGroupUid99999999";
     private static Contentstack instance;
@@ -37,7 +36,10 @@ public static Contentstack getClient() {
         if (instance == null) {
             synchronized (Contentstack.class) {
                 if (instance == null) {
-                    instance = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
+                    instance = new Contentstack.Builder()
+                            .setAuthtoken(AUTHTOKEN)
+                            .setHost(DEV_HOST)
+                            .build();
                 }
             }
         }
@@ -69,7 +71,11 @@ public static Stack getStack() {
         if (stackInstance == null) {
             synchronized (Stack.class) {
                 if (stackInstance == null) {
-                    stackInstance = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build().stack(headers);
+                    stackInstance = new Contentstack.Builder()
+                            .setAuthtoken(AUTHTOKEN)
+                            .setHost(DEV_HOST)
+                            .build()
+                            .stack(headers);
                 }
             }
         }

src/test/java/com/contentstack/cms/oauth/OAuthTest.java

@@ -221,25 +221,18 @@ public void testHostTransformations() {
         String[][] testCases = {
             // Default region
             {"api.contentstack.io", "app.contentstack.com", "developerhub-api.contentstack.com"},
-            {"api-contentstack.com", "app-contentstack.com", "developerhub-api-contentstack.com"},
 
             // AWS regions
             {"eu-api.contentstack.com", "eu-app.contentstack.com", "eu-developerhub-api.contentstack.com"},
-            {"eu-api-contentstack.com", "eu-app-contentstack.com", "eu-developerhub-api-contentstack.com"},
             {"au-api.contentstack.com", "au-app.contentstack.com", "au-developerhub-api.contentstack.com"},
-            {"au-api-contentstack.com", "au-app-contentstack.com", "au-developerhub-api-contentstack.com"},
 
             // Azure regions
             {"azure-na-api.contentstack.com", "azure-na-app.contentstack.com", "azure-na-developerhub-api.contentstack.com"},
-            {"azure-na-api-contentstack.com", "azure-na-app-contentstack.com", "azure-na-developerhub-api-contentstack.com"},
             {"azure-eu-api.contentstack.com", "azure-eu-app.contentstack.com", "azure-eu-developerhub-api.contentstack.com"},
-            {"azure-eu-api-contentstack.com", "azure-eu-app-contentstack.com", "azure-eu-developerhub-api-contentstack.com"},
 
             // GCP regions
             {"gcp-na-api.contentstack.com", "gcp-na-app.contentstack.com", "gcp-na-developerhub-api.contentstack.com"},
-            {"gcp-na-api-contentstack.com", "gcp-na-app-contentstack.com", "gcp-na-developerhub-api-contentstack.com"},
-            {"gcp-eu-api.contentstack.com", "gcp-eu-app.contentstack.com", "gcp-eu-developerhub-api.contentstack.com"},
-            {"gcp-eu-api-contentstack.com", "gcp-eu-app-contentstack.com", "gcp-eu-developerhub-api-contentstack.com"}
+            {"gcp-eu-api.contentstack.com", "gcp-eu-app.contentstack.com", "gcp-eu-developerhub-api.contentstack.com"}
         };
 
         for (String[] testCase : testCases) {