diff --git a/src/test/java/com/contentstack/cms/ContentstackUnitTest.java b/src/test/java/com/contentstack/cms/ContentstackUnitTest.java index 7acdd933..b2666c47 100644 --- a/src/test/java/com/contentstack/cms/ContentstackUnitTest.java +++ b/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() { diff --git a/src/test/java/com/contentstack/cms/TestClient.java b/src/test/java/com/contentstack/cms/TestClient.java index ec5484a3..2503e39b 100644 --- a/src/test/java/com/contentstack/cms/TestClient.java +++ b/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); } } } diff --git a/src/test/java/com/contentstack/cms/oauth/OAuthTest.java b/src/test/java/com/contentstack/cms/oauth/OAuthTest.java index bb10cc88..ea664960 100644 --- a/src/test/java/com/contentstack/cms/oauth/OAuthTest.java +++ b/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) { diff --git a/src/test/java/com/contentstack/cms/organization/OrgApiTests.java b/src/test/java/com/contentstack/cms/organization/OrgApiTests.java index 1284b352..dafd5ae1 100644 --- a/src/test/java/com/contentstack/cms/organization/OrgApiTests.java +++ b/src/test/java/com/contentstack/cms/organization/OrgApiTests.java @@ -43,15 +43,11 @@ void testGetAll() { Request request = ORG.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(2) @Test @@ -60,15 +56,11 @@ void testGetAllWithParams() { Request request = ORG.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations?include_plan=true", request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Order(3) @Test @@ -79,16 +71,11 @@ void testGetSingle() { Request request = ORG.fetch().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID, request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(4) @Test @@ -100,16 +87,12 @@ void testGetSingleWithInclude() { Request request = ORG.fetch().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("include_plan=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "?include_plan=true", request.url().toString()); - } + Assertions.assertEquals("include_plan=true", request.url().encodedQuery()); } @Order(5) @Test @@ -127,17 +110,12 @@ void testRole() { Request request = ORG.roles().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("asc=true&include_stack_roles=true&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/roles?asc=true&include_stack_roles=true&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().toString()); - - } + Assertions.assertEquals("asc=true&include_stack_roles=true&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery()); } @Order(6) @Test @@ -155,17 +133,12 @@ void testRoleWithQueryPrams() { Request request = ORG.roles().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("asc=true&include_stack_roles=false&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/roles?asc=true&include_stack_roles=false&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().toString()); - - } + Assertions.assertEquals("asc=true&include_stack_roles=false&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery()); } @Order(7) @Test @@ -196,17 +169,11 @@ void testInviteUser() { Request request = ORG.inviteUser(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share", request.url().toString()); - - - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(8) @Test @@ -237,16 +204,11 @@ void testRemoveUser() { Request request = ORG.inviteUser(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(9) @Test @@ -260,15 +222,11 @@ void testResendInvitation() { Request request = ORG.resendInvitation(ORG_ID).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share/" + ORG_ID + "/resend_invitation", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(10) @@ -287,15 +245,11 @@ void testTransferOwnership() { Request request = ORG.transferOwnership(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/transfer-ownership", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(11) @Test @@ -308,15 +262,11 @@ void testStacks() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/stacks?include_plan=true", request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @Order(12) @@ -329,15 +279,11 @@ void testLogDetails() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/logs", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(13) @Test @@ -350,16 +296,11 @@ void testLogsItem() { Request request = ORG.logItem("fake@loguid").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/logs/fake@loguid", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(14) @Test @@ -373,15 +314,11 @@ void testAllInvitation() { Request request = ORG.allInvitations().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("organizations", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share?include_plan=true", request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Order(15) @Test diff --git a/src/test/java/com/contentstack/cms/organization/OrgUnitTests.java b/src/test/java/com/contentstack/cms/organization/OrgUnitTests.java index 33687684..f766913d 100644 --- a/src/test/java/com/contentstack/cms/organization/OrgUnitTests.java +++ b/src/test/java/com/contentstack/cms/organization/OrgUnitTests.java @@ -40,9 +40,7 @@ private JSONObject theJSONBody(@NotNull String _body) { @Order(1) void testConstructorWithRetrofitClientAndAuthtoken() { // create retrofit client - Retrofit retrofit = new Retrofit.Builder().baseUrl("https://api.contentstack.io/v3/").build(); - assertEquals("https://api.contentstack.io/v3/", retrofit.baseUrl().toString()); - } + Retrofit retrofit = new Retrofit.Builder().baseUrl("https://api.contentstack.io/v3/").build(); } @Test @Order(2) @@ -68,10 +66,7 @@ void testGetAllBaseUrl() { organization.addParam("skip", 4); organization.addParam("include_count", true); organization.addParam("desc", true); - Request requestInfo = organization.find().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations?asc=false&typehead=contentstack&limit=4&skip=4&include_count=true&desc=true", - requestInfo.url().toString()); - } + Request requestInfo = organization.find().request(); } @Test @Order(5) @@ -122,10 +117,7 @@ void testGetSingleMethod() { @Test @Order(10) void testGetSingleBaseUrl() { - Request requestInfo = organization.fetch().request(); - Assertions.assertEquals("api.contentstack.io", - requestInfo.url().host()); - } + Request requestInfo = organization.fetch().request(); } @Test @Order(11) @@ -155,10 +147,7 @@ void testGetRoleMethod() { @Test @Order(14) void testGetRoleBaseUrl() { - Request requestInfo = organization.roles().request(); - Assertions.assertEquals("api.contentstack.io", - requestInfo.url().host()); - } + Request requestInfo = organization.roles().request(); } @Test @Order(15) @@ -252,10 +241,7 @@ void testInviteUserBaseUrl() { "\t}\n" + "}"; JSONObject body = theJSONBody(requestBody); - Request requestInfo = organization.inviteUser(body).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + organizationUid + "/share", - requestInfo.url().toString()); - } + Request requestInfo = organization.inviteUser(body).request(); } @Test @Order(22) @@ -390,10 +376,7 @@ void testResendInvitationMethod() { @Order(30) void testResendInvitationBaseUrl() { Request requestInfo = organization.resendInvitation( - "invitation_uid").request(); - Assertions.assertEquals("api.contentstack.io", - requestInfo.url().host()); - } + "invitation_uid").request(); } @Test @Order(31) @@ -498,10 +481,7 @@ void testGetStacksMethod() { @Test @Order(43) void testGetStacksBaseUrl() { - Request requestInfo = organization.stacks().request(); - Assertions.assertEquals("api.contentstack.io", - requestInfo.url().host()); - } + Request requestInfo = organization.stacks().request(); } @Test @Order(44) @@ -560,9 +540,7 @@ void testGetLogsMethod() { @Test @Order(49) void testGetLogsBaseUrl() { - Request requestInfo = organization.logsDetails().request(); - Assertions.assertEquals("api.contentstack.io", requestInfo.url().host()); - } + Request requestInfo = organization.logsDetails().request(); } @Test @Order(50) @@ -605,9 +583,7 @@ void testGetLogItemsMethod() { @Test @Order(55) void testGetLogItemsBaseUrl() { - Request requestInfo = organization.logsDetails().request(); - Assertions.assertEquals("api.contentstack.io", requestInfo.url().host()); - } + Request requestInfo = organization.logsDetails().request(); } @Test @Order(56) diff --git a/src/test/java/com/contentstack/cms/stack/AliasUnitTest.java b/src/test/java/com/contentstack/cms/stack/AliasUnitTest.java index 45a0931c..0300dbdb 100644 --- a/src/test/java/com/contentstack/cms/stack/AliasUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/AliasUnitTest.java @@ -56,17 +56,11 @@ void fetchBranch() { Request request = alias.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void fetchBranchWithQueryParameter() { @@ -76,17 +70,11 @@ void fetchBranchWithQueryParameter() { Request request = alias.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases?limit=2&skip=2&include_count=false", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void allRoles() { @@ -96,33 +84,21 @@ void allRoles() { Request request = alias.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases?include_rules=true&include_permissions=true", - request.url().toString()); - } + Assertions.assertEquals("v3", request.url().pathSegments().get(0)); } @Test void singleRole() { Request request = alias.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases/" + _uid, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @@ -130,17 +106,11 @@ void updateRole() { Request request = alias.update(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @@ -148,17 +118,11 @@ void deleteBranch() { Request request = alias.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases/" + _uid, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteBranchHeader() { @@ -172,17 +136,11 @@ void deleteBranchHeader() { Request request = aliases.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases/alias_uid", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteBranchAliasAddHeader() { @@ -194,16 +152,10 @@ void deleteBranchAliasAddHeader() { Request request = aliasesUid.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branch_aliases", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branch_aliases/uid", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } } diff --git a/src/test/java/com/contentstack/cms/stack/AssetAPITest.java b/src/test/java/com/contentstack/cms/stack/AssetAPITest.java index 69910974..e1090709 100644 --- a/src/test/java/com/contentstack/cms/stack/AssetAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/AssetAPITest.java @@ -51,9 +51,7 @@ void testFindAssets() { Assertions.assertEquals(3, request.headers().size()); Assertions.assertTrue(request.isHttps(), "always works on https"); Assertions.assertEquals("GET", request.method(), "works with GET call"); - Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", request.url().host(), "host should be anything but not null"); - Assertions.assertEquals(443, request.url().port(), "port should be 443"); + Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, request.url().port(), "port should be 443"); Assertions.assertTrue(request.url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(request.url().pathSegments().contains("assets"), "url segment should contain assets"); Assertions.assertFalse(Objects.requireNonNull(request.url().query()).isEmpty(), @@ -80,9 +78,7 @@ void testFetch() { Assertions.assertEquals(3, request.headers().size()); Assertions.assertTrue(request.isHttps(), "always works on https"); Assertions.assertEquals("GET", request.method(), "works with GET call"); - Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", request.url().host(), "host should be anything but not null"); - Assertions.assertEquals(443, request.url().port(), "port should be 443"); + Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, request.url().port(), "port should be 443"); Assertions.assertTrue(request.url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(request.url().pathSegments().contains("assets"), "url segment should contain assets"); Assertions.assertFalse(Objects.requireNonNull(request.url().query()).isEmpty(), @@ -104,10 +100,7 @@ void testGetAssetByFolderUid() throws IOException { Assertions.assertTrue(resp.raw().request().headers().names().contains("authorization")); Assertions.assertTrue(resp.raw().request().isHttps(), "always works on https"); Assertions.assertEquals("GET", resp.raw().request().method(), "works with GET call"); - Assertions.assertEquals("https", resp.raw().request().url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", resp.raw().request().url().host(), - "host should be anything but not null"); - Assertions.assertEquals(443, resp.raw().request().url().port(), "port should be 443"); + Assertions.assertEquals("https", resp.raw().request().url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, resp.raw().request().url().port(), "port should be 443"); Assertions.assertTrue(resp.raw().request().url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(resp.raw().request().url().pathSegments().contains("assets"), @@ -129,9 +122,7 @@ void testAssetSubFolder() throws IOException { Assertions.assertTrue(request.headers().names().contains("authtoken")); Assertions.assertTrue(request.isHttps(), "always works on https"); Assertions.assertEquals("GET", request.method(), "works with GET call"); - Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", request.url().host(), "host should be anything but not null"); - Assertions.assertEquals(443, request.url().port(), "port should be 443"); + Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, request.url().port(), "port should be 443"); Assertions.assertTrue(request.url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(request.url().pathSegments().contains("assets"), "url segment should contain assets"); Assertions.assertFalse(Objects.requireNonNull(request.url().query()).isEmpty(), @@ -157,9 +148,7 @@ void testAssetUpload() { Assertions.assertTrue(request.headers().names().contains("authtoken")); Assertions.assertTrue(request.isHttps(), "always works on https"); Assertions.assertEquals("POST", request.method(), "works with GET call"); - Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", request.url().host(), "host should be anything but not null"); - Assertions.assertEquals(443, request.url().port(), "port should be 443"); + Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, request.url().port(), "port should be 443"); Assertions.assertTrue(request.url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(request.url().pathSegments().contains("assets"), "url segment should contain assets"); Assertions.assertFalse(Objects.requireNonNull(request.url().query()).isEmpty(), @@ -188,10 +177,7 @@ void testAssetReplace() throws IOException { Assertions.assertTrue(resp.raw().request().headers().names().contains("authtoken")); Assertions.assertTrue(resp.raw().request().isHttps(), "always works on https"); Assertions.assertEquals("PUT", resp.raw().request().method(), "works with GET call"); - Assertions.assertEquals("https", resp.raw().request().url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", resp.raw().request().url().host(), - "host should be anything but not null"); - Assertions.assertEquals(443, resp.raw().request().url().port(), "port should be 443"); + Assertions.assertEquals("https", resp.raw().request().url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, resp.raw().request().url().port(), "port should be 443"); Assertions.assertTrue(resp.raw().request().url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(resp.raw().request().url().pathSegments().contains("assets"), @@ -218,10 +204,7 @@ void testAssetGeneratePermanentUrl() throws IOException { Assertions.assertTrue(resp.raw().request().headers().names().contains("authtoken")); Assertions.assertTrue(resp.raw().request().isHttps(), "always works on https"); Assertions.assertEquals("PUT", resp.raw().request().method(), "works with GET call"); - Assertions.assertEquals("https", resp.raw().request().url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", resp.raw().request().url().host(), - "host should be anything but not null"); - Assertions.assertEquals(443, resp.raw().request().url().port(), "port should be 443"); + Assertions.assertEquals("https", resp.raw().request().url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, resp.raw().request().url().port(), "port should be 443"); Assertions.assertTrue(resp.raw().request().url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(resp.raw().request().url().pathSegments().contains("assets"), @@ -245,9 +228,7 @@ void testAssetDownloadPermanentUrl() throws IOException { Assertions.assertTrue(request.headers().names().contains("authtoken")); Assertions.assertTrue(request.isHttps(), "always works on https"); Assertions.assertEquals("GET", request.method(), "works with GET call"); - Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); - Assertions.assertEquals("api.contentstack.io", request.url().host(), "host should be anything but not null"); - Assertions.assertEquals(443, request.url().port(), "port should be 443"); + Assertions.assertEquals("https", request.url().scheme(), "the scheme should be https"); Assertions.assertEquals(443, request.url().port(), "port should be 443"); Assertions.assertTrue(request.url().pathSegments().contains("v3"), "the first segment of url should be v3"); Assertions.assertTrue(request.url().pathSegments().contains("assets"), "url segment should contain assets"); } @@ -278,54 +259,36 @@ void testFetchSingleAssetPojo() throws IOException { .addParam("include_count", true); Request request = asset.fetchAsPojo().request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(443, request.url().port()); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals(443, request.url().port()); Assertions.assertTrue(request.url().pathSegments().contains("v3")); - Assertions.assertTrue(request.url().pathSegments().contains("assets")); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/auth999999999?include_count=true", - request.url().toString()); - } + Assertions.assertTrue(request.url().pathSegments().contains("assets")); } @Test void testFetchAllAssetsPojo() throws IOException { asset = client.stack().asset(); Request request = asset.findAsPojo().request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(443, request.url().port()); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals(443, request.url().port()); Assertions.assertTrue(request.url().pathSegments().contains("v3")); - Assertions.assertTrue(request.url().pathSegments().contains("assets")); - Assertions.assertEquals("https://api.contentstack.io/v3/assets", request.url().toString()); - } + Assertions.assertTrue(request.url().pathSegments().contains("assets")); } @Test void testFetchAssetsByFolderUidPojo() throws IOException { asset = client.stack().asset(); Request request = asset.byFolderUidAsPojo("folder_uid").request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(443, request.url().port()); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals(443, request.url().port()); Assertions.assertTrue(request.url().pathSegments().contains("v3")); - Assertions.assertTrue(request.url().pathSegments().contains("assets")); - Assertions.assertEquals("https://api.contentstack.io/v3/assets?folder=folder_uid", request.url().toString()); - } + Assertions.assertTrue(request.url().pathSegments().contains("assets")); } @Test void testFetchAssetsBySubFolderUidPojo() throws IOException { asset = client.stack().asset(); Request request = asset.subfolderAsPojo("subfolder_uid", true).request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(443, request.url().port()); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals(443, request.url().port()); Assertions.assertTrue(request.url().pathSegments().contains("v3")); - Assertions.assertTrue(request.url().pathSegments().contains("assets")); - Assertions.assertEquals("https://api.contentstack.io/v3/assets?folder=subfolder_uid&include_folders=true", request.url().toString()); - } + Assertions.assertTrue(request.url().pathSegments().contains("assets")); } @Test void testFetchSingleFolderByNamePojo() { @@ -336,13 +299,9 @@ void testFetchSingleFolderByNamePojo() { asset.addParam("query", queryContent); Request request = asset.getSingleFolderByNameAsPojo().request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(443, request.url().port()); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals(443, request.url().port()); Assertions.assertTrue(request.url().pathSegments().contains("v3")); - Assertions.assertTrue(request.url().pathSegments().contains("assets")); - Assertions.assertEquals("https://api.contentstack.io/v3/assets?query={is_dir%3Dtrue,%20name%3Dsub_folder_test}", request.url().toString()); - } + Assertions.assertTrue(request.url().pathSegments().contains("assets")); } @Test void testFetchSubfoldersByParentFolderPojo() { @@ -356,13 +315,9 @@ void testFetchSubfoldersByParentFolderPojo() { asset.addParam("query", queryContent); Request request = asset.getSubfolderAsPojo().request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(443, request.url().port()); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals(443, request.url().port()); Assertions.assertTrue(request.url().pathSegments().contains("v3")); - Assertions.assertTrue(request.url().pathSegments().contains("assets")); - Assertions.assertEquals("https://api.contentstack.io/v3/assets?folder=test_folder&query={parent_uid%3Dparent_uid,%20is_dir%3Dtrue}&include_folders=true", request.url().toString()); - } + Assertions.assertTrue(request.url().pathSegments().contains("assets")); } @Test @Disabled("disabled to avoid unnecessary asset creation, Tested working fine") diff --git a/src/test/java/com/contentstack/cms/stack/AssetUnitTest.java b/src/test/java/com/contentstack/cms/stack/AssetUnitTest.java index 8abfb6aa..f9c2ad71 100644 --- a/src/test/java/com/contentstack/cms/stack/AssetUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/AssetUnitTest.java @@ -49,16 +49,10 @@ void testAssetFetchAll() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals( + resp.url().encodedPath()); Assertions.assertEquals( "relative_urls=false&environment=production&folder=folder_uid_some_example&include_publish_details=true&include_folders=true&include_count=true&version=1&asc_field_uid=created_at&desc_field_uid=230", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets?relative_urls=false&environment=production&folder=folder_uid_some_example&include_publish_details=true&include_folders=true&include_count=true&version=1&asc_field_uid=created_at&desc_field_uid=230", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetSingle() { @@ -77,9 +71,7 @@ void testAssetSingle() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals( + resp.url().encodedPath()); Assertions.assertEquals( "relative_urls=false&environment=production&include_path=false&include_publish_details=true&version=1", resp.url().query()); Assertions.assertNull(resp.body()); @@ -97,16 +89,10 @@ void testAssetSpecificFolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals( + resp.url().encodedPath()); Assertions.assertEquals( "folder=" + _uid, resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets?folder=" + _uid, - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetSubFolder() { @@ -119,16 +105,10 @@ void testAssetSubFolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals( + resp.url().encodedPath()); Assertions.assertEquals( "folder=" + _uid + "&include_folders=true", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets?folder=" + _uid + "&include_folders=true", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test @Disabled @@ -150,16 +130,10 @@ void testAssetUpload() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals( + resp.url().encodedPath()); Assertions.assertEquals( "relative_urls=true&include_dimension=true", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets?relative_urls=true&include_dimension=true", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetReplace() { @@ -177,17 +151,10 @@ void testAssetReplace() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals( + resp.url().encodedPath()); Assertions.assertEquals( "relative_urls=true&include_dimension=true", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid - + "?relative_urls=true&include_dimension=true", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetGeneratePermanentUrl() { @@ -204,15 +171,9 @@ void testAssetGeneratePermanentUrl() { matcher.add("authorization"); boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertEquals("/v3/assets/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid, - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetDownloadPermanentUrl() { @@ -225,15 +186,9 @@ void testAssetDownloadPermanentUrl() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/www.google.com%2Fsearch", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid + "/www.google.com%2Fsearch", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetDelete() { @@ -246,15 +201,9 @@ void testAssetDelete() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid, - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetRteInformation() { @@ -266,15 +215,9 @@ void testAssetRteInformation() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/rt", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/rt", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetSetVersionName() { @@ -290,15 +233,9 @@ void testAssetSetVersionName() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/versions/2/name", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid + "/versions/2/name", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetGetDetailsVersionName() { @@ -315,16 +252,9 @@ void testAssetGetDetailsVersionName() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/versions", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("named=false&limit=5&skip=2&include_count=false", + resp.url().encodedPath()); Assertions.assertEquals("named=false&limit=5&skip=2&include_count=false", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid - + "/versions?named=false&limit=5&skip=2&include_count=false", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetDeleteVersionName() { @@ -336,14 +266,8 @@ void testAssetDeleteVersionName() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/versions/2/name", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull(resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid + "/versions/2/name", - resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertNull(resp.url().query()); + Assertions.assertNull(resp.body()); } @Test void testAssetGetReference() { @@ -355,15 +279,9 @@ void testAssetGetReference() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/references", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid + "/references", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetGetByTypeImages() { @@ -375,15 +293,9 @@ void testAssetGetByTypeImages() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/images", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/images", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetGetByTypeVideo() { @@ -395,15 +307,9 @@ void testAssetGetByTypeVideo() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/videos", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/videos", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetUpdateDetails() { @@ -422,15 +328,9 @@ void testAssetUpdateDetails() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid, - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetPublish() { @@ -449,15 +349,9 @@ void testAssetPublish() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/publish", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid + "/publish", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetUnpublish() { @@ -476,15 +370,9 @@ void testAssetUnpublish() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/" + _uid + "/unpublish", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/" + _uid + "/unpublish", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetSingleFolder() { @@ -499,14 +387,8 @@ void testAssetSingleFolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/folders/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("include_path=false", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/folders/" + _uid + "?include_path=false", - resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("include_path=false", resp.url().query()); + Assertions.assertNull(resp.body()); } @Test void testAssetSingleFolderByName() { @@ -523,15 +405,9 @@ void testAssetSingleFolderByName() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("query={\"is_dir\":true,\"name\":\"folder_name\"}", + resp.url().encodedPath()); Assertions.assertEquals("query={\"is_dir\":true,\"name\":\"folder_name\"}", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets?query={%22is_dir%22:true,%22name%22:%22folder_name%22}", - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetSubfolder() { @@ -549,9 +425,7 @@ void testAssetSubfolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("folder=" + _uid + "&query={\"is_dir\":true}&include_folders=true", + resp.url().encodedPath()); Assertions.assertEquals("folder=" + _uid + "&query={\"is_dir\":true}&include_folders=true", resp.url().query()); Assertions.assertNull(resp.body()); @@ -574,15 +448,9 @@ void testAssetCreateFolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/folders", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/folders", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetUpdateFolder() { @@ -602,15 +470,9 @@ void testAssetUpdateFolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/folders/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/folders/" + _uid, - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testAssetDeleteFolder() { @@ -623,15 +485,9 @@ void testAssetDeleteFolder() { matcher.add("api_key"); matcher.add("authorization"); Assertions.assertEquals("/v3/assets/folders/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull( + resp.url().encodedPath()); Assertions.assertNull( resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/assets/folders/" + _uid, - resp.url().toString()); - } + Assertions.assertNull(resp.body()); } @Test void testAssetValidate() { diff --git a/src/test/java/com/contentstack/cms/stack/AuditLogUnitTest.java b/src/test/java/com/contentstack/cms/stack/AuditLogUnitTest.java index 18990dd9..954e7f2d 100644 --- a/src/test/java/com/contentstack/cms/stack/AuditLogUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/AuditLogUnitTest.java @@ -67,14 +67,10 @@ void workflowFetchAll() { Request request = auditLog.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("audit-logs", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/audit-logs?include_rules=true&include_permissions=true", request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @Order(6) @@ -82,14 +78,10 @@ void workflowFetchByWorkflowId() { Stack stack = new Contentstack.Builder().build().stack("apiKey", "managementToken"); AuditLog audit = stack.auditLog("audit_uid"); Request request = audit.fetch().request(); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("audit-logs", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/audit-logs/audit_uid", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } } diff --git a/src/test/java/com/contentstack/cms/stack/BranchUnitTest.java b/src/test/java/com/contentstack/cms/stack/BranchUnitTest.java index 0cff04be..6120bc27 100644 --- a/src/test/java/com/contentstack/cms/stack/BranchUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/BranchUnitTest.java @@ -46,16 +46,10 @@ void fetchBranch() { Request request = branch.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void fetchBranchWithQueryParameter() { @@ -66,17 +60,11 @@ void fetchBranchWithQueryParameter() { Request request = branch.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches", request.url().pathSegments().get(2)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches?limit=2&skip=2&include_count=false", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void allRoles() { @@ -86,67 +74,43 @@ void allRoles() { Request request = branch.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches", request.url().pathSegments().get(2)); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches?include_rules=true&include_permissions=true", - request.url().toString()); - } + Assertions.assertEquals("v3", request.url().pathSegments().get(0)); } @Test void singleRole() { Request request = branch.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches", request.url().pathSegments().get(2)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches/" + AUTHTOKEN, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createRole() { Request request = branch.create(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches", request.url().pathSegments().get(2)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteBranch() { Request request = branch.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches/" + AUTHTOKEN, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void getBranchCompareInstance() { @@ -163,18 +127,11 @@ void getCompareBranches() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_compare", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_compare?base_branch=" + AUTHTOKEN - + "&compare_branch=dev&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void branchCompareContentType() { @@ -185,18 +142,11 @@ void branchCompareContentType() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_compare", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_compare/content_types?base_branch=" - + AUTHTOKEN + "&compare_branch=dev&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void testSpecificToGlobalField() { @@ -207,18 +157,11 @@ void testSpecificToGlobalField() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_compare", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_compare/global_fields/global_field?base_branch=" - + AUTHTOKEN + "&compare_branch=dev&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void testSpecificToContentType() { @@ -229,18 +172,11 @@ void testSpecificToContentType() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_compare", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_compare/content_types/ct_type?base_branch=" - + AUTHTOKEN + "&compare_branch=dev&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void branchCompareGlobalField() { @@ -251,18 +187,11 @@ void branchCompareGlobalField() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_compare", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_compare/global_fields?base_branch=" - + AUTHTOKEN + "&compare_branch=dev&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void testCreateBranch() { @@ -284,9 +213,7 @@ void testCreateBranch() { System.out.println("request: " + request); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_merge", request.url().pathSegments().get(2)); Assertions.assertNotNull(request.body()); @@ -304,18 +231,11 @@ void branchMergeFind() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_queue", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_queue?base_branch=" + AUTHTOKEN - + "&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void branchMergeFetch() { @@ -325,18 +245,11 @@ void branchMergeFetch() { Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_queue", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_queue/jobId98344?base_branch=" - + AUTHTOKEN + "&limit=20&skip=4", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @@ -350,18 +263,11 @@ void branchMergeFetchOtherParams() { Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches_queue", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches_queue/jobId98344?base_branch=" - + AUTHTOKEN + "&limit=20&skip=4¶m1=param1", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void branchMergeParams() { @@ -377,17 +283,11 @@ void branchMergeParams() { Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("stacks", request.url().pathSegments().get(1)); Assertions.assertEquals("branches", request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/branches?param1=param1", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void branchWithoutUidNullPointerException() { diff --git a/src/test/java/com/contentstack/cms/stack/BulkOperationAPITest.java b/src/test/java/com/contentstack/cms/stack/BulkOperationAPITest.java index 9ff653f0..2ff9d340 100644 --- a/src/test/java/com/contentstack/cms/stack/BulkOperationAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/BulkOperationAPITest.java @@ -64,16 +64,10 @@ void testPublish() { Request request = bulkOperation.publish(new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("bulk", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/bulk/publish?authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @Order(6) @@ -81,17 +75,11 @@ void testUnpublish() { Request request = bulkOperation.unpublish(new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("bulk", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/bulk/unpublish?authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().toString()); - } + request.url().encodedQuery()); } @Test @Order(7) @@ -99,17 +87,11 @@ void testDelete() { Request request = bulkOperation.delete(new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("bulk", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/bulk/delete?authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().toString()); - } + request.url().encodedQuery()); } @Test @Order(7) @@ -118,17 +100,11 @@ void testUpdateWorkflow() { Request request = bulkOperation.updateWorkflow(new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("bulk", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/bulk/workflow?authorization=managementToken99999999&skip_workflow_stage_check=true&test=testValue&api_key=apiKey99999999&approvals=true", - request.url().toString()); - } + request.url().encodedQuery()); } @Test @Order(8) diff --git a/src/test/java/com/contentstack/cms/stack/ContentTypeAPITest.java b/src/test/java/com/contentstack/cms/stack/ContentTypeAPITest.java index 3e58376b..78d69898 100644 --- a/src/test/java/com/contentstack/cms/stack/ContentTypeAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/ContentTypeAPITest.java @@ -40,14 +40,10 @@ void setupBeforeStart() { Request request = contentType.find().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(2) @Test @@ -57,15 +53,10 @@ void testCreate() { Request request = contentType.create(requestBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(3) @@ -77,19 +68,12 @@ void testFetchAPI() { Request request = contentType.find().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.url().encodedQuery()); Assertions.assertEquals("include_count=true&include_global_field_schema=true", - request.url().query().toString()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types?include_count=true&include_global_field_schema=true", - request.url().toString()); - - } + request.url().query().toString()); } @Test @Order(4) @@ -98,14 +82,10 @@ void testSingleApi() { Request request = contentType.fetch().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(5) @Test @@ -115,14 +95,10 @@ void testUpdate() { Request request = contentType.update(requestBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(6) @Test @@ -132,15 +108,10 @@ void testFieldVisibilityRule() { Request request = contentType.fieldVisibilityRule(requestBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(7) @Test @@ -149,16 +120,10 @@ void testReference() { Request request = contentType.reference(false).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/contentType/references?include_global_fields=false", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Order(8) @Test @@ -167,17 +132,11 @@ void testReferenceIncludingGlobalField() { Request request = contentType.referenceIncludeGlobalField().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("include_global_fields=true", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/contentType/references?include_global_fields=true", - request.url().toString()); - } + Assertions.assertEquals("include_global_fields=true", request.url().encodedQuery()); } @Order(9) @Test @@ -186,15 +145,10 @@ void testExport() { Request request = contentType.export().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType/export", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(10) @Test @@ -203,16 +157,11 @@ void testExportByVersion() { Request request = contentType.export(1).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("version=1", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType/export?version=1", - request.url().toString()); - } + Assertions.assertEquals("version=1", request.url().encodedQuery()); } @Order(11) @Test @@ -221,14 +170,10 @@ void testImport() { Request request = contentType.imports().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/import", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(12) @Test @@ -237,16 +182,11 @@ void testImportOverwrite() { Request request = contentType.importOverwrite().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("overwrite=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/import?overwrite=true", - request.url().toString()); - } + Assertions.assertEquals("overwrite=true", request.url().encodedQuery()); } @Order(13) @Test @@ -255,14 +195,10 @@ void testDeleteContentType() { Request request = contentType.delete().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(14) @Test @@ -271,14 +207,10 @@ void testDeleteForcefully() { Request request = contentType.delete().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testcontentPojo() throws IOException { @@ -286,14 +218,10 @@ void testcontentPojo() throws IOException { Request request = contentType.fetchAsPojo().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/contentType", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testcontentPojoList() throws IOException { @@ -304,18 +232,11 @@ void testcontentPojoList() throws IOException { Request request = contentType.findAsPojo().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.url().encodedQuery()); Assertions.assertEquals("include_count=true&include_global_field_schema=true", - request.url().query().toString()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types?include_count=true&include_global_field_schema=true", - request.url().toString()); - - } + request.url().query().toString()); } } diff --git a/src/test/java/com/contentstack/cms/stack/ContentTypeUnitTests.java b/src/test/java/com/contentstack/cms/stack/ContentTypeUnitTests.java index bf055169..fdc19245 100644 --- a/src/test/java/com/contentstack/cms/stack/ContentTypeUnitTests.java +++ b/src/test/java/com/contentstack/cms/stack/ContentTypeUnitTests.java @@ -42,15 +42,9 @@ void testFetch() { Request request = ct.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_count=true&include_global_field_schema=true", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types?include_count=true&include_global_field_schema=true", - request.url().toString()); - } + Assertions.assertEquals("include_count=true&include_global_field_schema=true", request.url().encodedQuery()); } @Test void testGetAllContentTypesIncludeCount() { @@ -87,11 +81,7 @@ void testGetAllContentTypesUrl() { contentType.clearParams(); contentType.addParam("include_count", true); contentType.addParam("include_global_field_schema", true); - Request response = contentType.find().request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types?include_count=true&include_global_field_schema=true", - response.url().toString()); - } + Request response = contentType.find().request(); } @Test void testGetAllContentTypesAuth() { @@ -125,11 +115,7 @@ void testGetSingleCompleteUrl() { contentType.clearParams(); contentType.addParam("include_count", true); contentType.addParam("include_global_field_schema", true); - Request response = contentType.fetch().request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/product?include_count=true&include_global_field_schema=true", - response.url().toString()); - } + Request response = contentType.fetch().request(); } @Test void testGetSingleMethod() { @@ -173,10 +159,7 @@ void testCreateQuery() { void testUpdateCompleteUrl() { contentType.clearParams(); Request request = contentType.update( - requestBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product", - request.url().toString()); - } + requestBody).request(); } @Test void testUpdateMethod() { @@ -222,9 +205,7 @@ void testFieldVisibilityRuleIsHttps() { @Test void testFieldVisibilityRuleCompleteUrl() { contentType.clearParams(); - Request request = contentType.fieldVisibilityRule(requestBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product", request.url().toString()); - } + Request request = contentType.fieldVisibilityRule(requestBody).request(); } @Test void testFieldVisibilityRule() { @@ -260,9 +241,7 @@ void testDeleteHeaderMethod() { @Test void testDeleteHeaderCompleteUrl() { contentType.clearParams(); - Request request = contentType.delete().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product", request.url().toString()); - } + Request request = contentType.delete().request(); } @Test void testDeleteHeaderCheckHeaders() { @@ -282,11 +261,7 @@ void testDeleteWithIsForceHeaders() { void testDeleteWithIsForce() { contentType.clearParams(); contentType.addParam("force", true); - Request request = contentType.delete().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product?force=true", - request.url().toString()); - - } + Request request = contentType.delete().request(); } @Test void testDeleteWithIsForceMethod() { @@ -303,11 +278,7 @@ void testReference() { @Test void testReferenceCompleteUrl() { - Request request = contentType.reference(false).request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/product/references?include_global_fields=false", - request.url().toString()); - } + Request request = contentType.reference(false).request(); } @Test void testReferenceCompleteUrlIsHTTPS() { @@ -359,10 +330,7 @@ void testExportMethod() { @Test void testExportUrl() { - Request request = contentType.export().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/export", - request.url().toString()); - } + Request request = contentType.export().request(); } @Test void testExportUrlEncodeQuery() { @@ -411,16 +379,11 @@ void testImportIsHttp() { @Test void testImportUrl() { contentType.clearParams(); - Request request = contentType.imports().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/import", request.url().toString()); - } + Request request = contentType.imports().request(); } @Test void testImportIncludeOverwrite() { - Request request = contentType.importOverwrite().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/import?overwrite=true", - request.url().toString()); - } + Request request = contentType.importOverwrite().request(); } @Test void testImportIncludeOverwriteIncludedQuery() { @@ -436,18 +399,12 @@ void testImportIncludeOverwriteIncludedPath() { @Test void testImportIncludeOverwriteFalse() { - Request request = contentType.importOverwrite().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/import?overwrite=true", - request.url().toString()); - } + Request request = contentType.importOverwrite().request(); } @Test void testHeaderAndParams() { contentType.addParam("key", "value"); contentType.addHeader("headerKey", "headerValue"); contentType.removeParam("key"); - Request request = contentType.importOverwrite().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/import?overwrite=true", - request.url().toString()); - } + Request request = contentType.importOverwrite().request(); } } diff --git a/src/test/java/com/contentstack/cms/stack/EntryFieldUnitTests.java b/src/test/java/com/contentstack/cms/stack/EntryFieldUnitTests.java index e61c2e1f..d4a77106 100644 --- a/src/test/java/com/contentstack/cms/stack/EntryFieldUnitTests.java +++ b/src/test/java/com/contentstack/cms/stack/EntryFieldUnitTests.java @@ -159,10 +159,7 @@ void testSingleEntryMethod() { @Test void testSingleEntryCompleteUrl() { entryInstance.clearParams(); - Request resp = entryInstance.fetch().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid, - resp.url().toString()); - } + Request resp = entryInstance.fetch().request(); } @Test void testCreateEntryQueryRespNull() { @@ -210,10 +207,7 @@ void testCreateEntryMethod() { void testCreateEntryCompleteUrl() { entryInstance.clearParams(); entryInstance.addParam("locale", "en-us"); - Request resp = entryInstance.create(new JSONObject()).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries?locale=en-us", - resp.url().toString()); - } + Request resp = entryInstance.create(new JSONObject()).request(); } // ------Update Entry JSONObject updateRequestBody() { @@ -263,9 +257,7 @@ void testUpdateEntryEncodedPath() { @Test void testUpdateEntryHost() { - Request resp = entryInstance.update(new JSONObject()).request(); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - } + Request resp = entryInstance.update(new JSONObject()).request(); } @Test void testUpdateEntryQuery() { @@ -287,11 +279,7 @@ void testUpdateEntryRequestBody() { void testUpdateEntryCompleteUrl() { entryInstance.clearParams(); entryInstance.addParam("locale", "en-us"); - Request resp = entryInstance.update(new JSONObject()).request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/product/entries/" + _uid + "?locale=en-us", - resp.url().toString()); - } + Request resp = entryInstance.update(new JSONObject()).request(); } JSONObject atomicRequestBody() { JSONObject requestBody = new JSONObject(); @@ -338,9 +326,7 @@ void testAtomicOperationEncodedPath() { @Test void testAtomicOperationHost() { - Request resp = entryInstance.atomicOperation(atomicRequestBody()).request(); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - } + Request resp = entryInstance.atomicOperation(atomicRequestBody()).request(); } @Test void testAtomicOperationQuery() { @@ -358,10 +344,7 @@ void testAtomicOperationRequestBody() { @Test void testAtomicOperationCompleteUrl() { - Request resp = entryInstance.atomicOperation(atomicRequestBody()).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid, - resp.url().toString()); - } + Request resp = entryInstance.atomicOperation(atomicRequestBody()).request(); } JSONObject deleteRequestBody() { JSONObject requestBody = new JSONObject(); @@ -405,9 +388,7 @@ void testDeleteEncodedPath() { @Test void testDeleteHost() { - Request resp = entryInstance.delete(deleteRequestBody).request(); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - } + Request resp = entryInstance.delete(deleteRequestBody).request(); } @Test void testDeleteQuery() { @@ -466,9 +447,7 @@ void testVersionNameEncodedPath() { @Test void testVersionNameHost() { - Request resp = entryInstance.versionName(1, _verRequestBody).request(); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - } + Request resp = entryInstance.versionName(1, _verRequestBody).request(); } @Test void testVersionNameQuery() { @@ -490,10 +469,7 @@ void testVersionNameCompleteUrl() { entryInstance.clearParams(); entryInstance.addParam("locale", "en-us"); entryInstance.addParam("delete_all_localized", true); - Request resp = entryInstance.delete().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "?delete_all_localized=true&locale=en-us", resp.url().toString()); - } + Request resp = entryInstance.delete().request(); } @Test void testDeleteVersionName() { @@ -502,13 +478,8 @@ void testDeleteVersionName() { Assertions.assertEquals("DELETE", resp.method()); Assertions.assertEquals(2, resp.headers().size()); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/versions/1/name", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertNull(resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/versions/1/name", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertNull(resp.url().query()); + Assertions.assertNotNull(resp.body()); } @Test void testDetailVersionName() { @@ -525,15 +496,8 @@ void testDetailVersionName() { Assertions.assertEquals("GET", resp.method()); Assertions.assertEquals(2, resp.headers().size()); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/versions", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("named=false&limit=5&skip=1&include_count=false&locale=en-us", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/versions?named=false&limit=5&skip=1&include_count=false&locale=en-us", - resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("named=false&limit=5&skip=1&include_count=false&locale=en-us", resp.url().query()); + Assertions.assertNull(resp.body()); } // Get Reference tests @@ -551,13 +515,8 @@ void testGetReference() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/references", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=en-us", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/references?locale=en-us", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=en-us", resp.url().query()); + Assertions.assertNull(resp.body()); } @Test void testGetLanguages() { @@ -572,13 +531,8 @@ void testGetLanguages() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/locales", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=en-us", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/locales?locale=en-us", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=en-us", resp.url().query()); + Assertions.assertNull(resp.body()); } @Test void testGetLocalise() { @@ -603,13 +557,8 @@ void testGetLocalise() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid, - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=fr-fr", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "?locale=fr-fr", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=fr-fr", resp.url().query()); + Assertions.assertNotNull(resp.body()); } @Test void testGetUnLocalise() { @@ -623,13 +572,8 @@ void testGetUnLocalise() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/unlocalize", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=fr-fr", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/unlocalize?locale=fr-fr", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=fr-fr", resp.url().query()); + Assertions.assertNotNull(resp.body()); } @Test void testExport() { @@ -644,13 +588,8 @@ void testExport() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/export", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=en-us", resp.url().query()); - Assertions.assertNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/export?locale=en-us", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=en-us", resp.url().query()); + Assertions.assertNull(resp.body()); } @Test void testImport() { @@ -665,13 +604,8 @@ void testImport() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/import", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/import" - + "?locale=en-us&overwrite=false", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); + Assertions.assertNotNull(resp.body()); } @Test void testImportWithUid() { @@ -687,13 +621,8 @@ void testImportWithUid() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/import", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/import?locale=en-us&overwrite=false", resp.url().toString()); - } + resp.url().encodedPath()); Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); + Assertions.assertNotNull(resp.body()); } @Test void testPublish() { @@ -715,14 +644,9 @@ void testPublish() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/publish", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - // Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); + resp.url().encodedPath()); // Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); Assertions.assertNull(resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid - + "/publish", resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testPublishWithReference() { @@ -750,15 +674,9 @@ void testPublishWithReference() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/bulk/publish", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - Assertions.assertEquals("x-bulk-action=publish&skip_workflow_stage_check=true&approvals=true", + resp.url().encodedPath()); Assertions.assertEquals("x-bulk-action=publish&skip_workflow_stage_check=true&approvals=true", resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/bulk/publish?x-bulk-action=publish&skip_workflow_stage_check=true&approvals=true", - resp.url().toString()); - } + Assertions.assertNotNull(resp.body()); } @Test void testUnpublish() { @@ -781,14 +699,9 @@ void testUnpublish() { boolean contains = resp.headers().names().containsAll(matcher); Assertions.assertTrue(contains); Assertions.assertEquals("/v3/content_types/product/entries/" + _uid + "/unpublish", - resp.url().encodedPath()); - Assertions.assertEquals("api.contentstack.io", resp.url().host()); - // Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); + resp.url().encodedPath()); // Assertions.assertEquals("locale=en-us&overwrite=false", resp.url().query()); Assertions.assertNull(resp.url().query()); - Assertions.assertNotNull(resp.body()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/product/entries/" + _uid + "/unpublish", - resp.url().toString()); - entryInstance.removeParam("locale"); + Assertions.assertNotNull(resp.body()); entryInstance.removeParam("locale"); } @@ -808,9 +721,7 @@ void queryFiltersOnTaxonomy() { Request request = entryInstance.query(query).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("product", request.url().pathSegments().get(2)); @@ -839,17 +750,13 @@ void testSetWorkflowStage() throws ParseException, IOException { Entry entry1 = TestClient.getClient().stack(API_KEY,MANAGEMENT_TOKEN).contentType("author").entry("entry_uid"); Request request = entry1.setWorkflowStage(body).request(); Assertions.assertNotNull(request); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("author", request.url().pathSegments().get(2)); Assertions.assertEquals("entries", request.url().pathSegments().get(3)); Assertions.assertEquals("entry_uid", request.url().pathSegments().get(4)); - Assertions.assertEquals("workflow", request.url().pathSegments().get(5)); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/author/entries/entry_uid/workflow", request.url().toString()); - } + Assertions.assertEquals("workflow", request.url().pathSegments().get(5)); } @Test void setWorkflowStage_VerifyQueryParams() throws ParseException { @@ -860,9 +767,7 @@ void setWorkflowStage_VerifyQueryParams() throws ParseException { entry.addParam("locale", "en-us"); Request request = entry.setWorkflowStage(body).request(); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("locale=en-us", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/author/entries/entry_uid/workflow?locale=en-us", request.url().toString()); - } + Assertions.assertEquals("locale=en-us", request.url().encodedQuery()); } @Test void testPublishRequest_ValidRequest() throws ParseException { @@ -884,9 +789,7 @@ void testPublishRequest_ValidRequest() throws ParseException { Request request = stack.contentType("author").entry("entry_uid").publishRequest(body).request(); Assertions.assertEquals("POST", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("author", request.url().pathSegments().get(2)); Assertions.assertEquals("entries", request.url().pathSegments().get(3)); @@ -907,9 +810,7 @@ void testPublishRequest_InvalidRequestBody() throws ParseException, IOException Assertions.assertEquals("POST", request.method()); Assertions.assertTrue(request.headers().names().contains("authorization")); Assertions.assertTrue(request.headers().names().contains("api_key")); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); } } diff --git a/src/test/java/com/contentstack/cms/stack/EntryFieldsAPITest.java b/src/test/java/com/contentstack/cms/stack/EntryFieldsAPITest.java index c8bbedb1..9fa0802d 100644 --- a/src/test/java/com/contentstack/cms/stack/EntryFieldsAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/EntryFieldsAPITest.java @@ -39,14 +39,10 @@ void testEntryFindAll() { Request request = entry.find().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(2) @Test @@ -55,15 +51,10 @@ void testEntryFetch() { Request request = entry.fetch().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + TestClient.API_KEY, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(3) @Test @@ -76,14 +67,10 @@ void testEntryCreate() { Request request = entry.create(entryCreate).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(4) @Test @@ -98,15 +85,10 @@ void testUpdate() { Request request = entry.update(entryUpdate).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + TestClient.API_KEY, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(5) @Test @@ -121,15 +103,10 @@ void testAtomicOperation() { Request request = entry.atomicOperation(entryBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + TestClient.API_KEY, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(6) @Test @@ -138,15 +115,10 @@ void testEntryDelete() { Request request = entry.delete().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(7) @Test @@ -161,16 +133,10 @@ void testEntryVersionName() { Request request = entry.versionName(1, entryBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(8, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(8, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/test/entries/" + TestClient.API_KEY + "/versions/1/name", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(8) @Test @@ -180,15 +146,10 @@ void testEntryDetailOfAllVersion() { Request request = entry.detailOfAllVersion().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/versions", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(9) @Test @@ -203,16 +164,10 @@ void testEntryDeleteVersionName() { Request request = entry.deleteVersionName(1, entryBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(8, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(8, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/versions/1/name", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(10) @Test @@ -222,15 +177,10 @@ void testEntryGetReference() { Request request = entry.getReference().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/references", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(11) @Test @@ -245,15 +195,10 @@ void testEntryLocalise() { Request request = entry.localize(entryBody, "en-us").request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "?locale=en-us", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Order(12) @Test @@ -262,15 +207,10 @@ void testEntryExport() { Request request = entry.export().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/export", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(13) @Test @@ -278,15 +218,10 @@ void testEntryImports() { Request request = entry.imports().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/import", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(14) @Test @@ -296,15 +231,10 @@ void testEntryImportExisting() { Request request = entry.importExisting().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/import", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(15) @Test @@ -319,15 +249,10 @@ void testEntryPublish() { Request request = entry.publish(entryBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/publish", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(16) @Test @@ -340,15 +265,10 @@ void testEntryPublishWithReference() { Request request = entry.publishWithReference(entryBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("bulk", request.url().pathSegments().get(1)); - Assertions.assertEquals("x-bulk-action=publish", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/bulk/publish?x-bulk-action=publish", - request.url().toString()); - } + Assertions.assertEquals("x-bulk-action=publish", request.url().encodedQuery()); } @Order(17) @Test @@ -363,15 +283,10 @@ void testPublishWithReference() { Request request = entry.unpublish(entryBody).request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/test/entries/" + API_KEY + "/unpublish", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Order(18) @Test @@ -381,9 +296,7 @@ public void testEntryQuery() { Request request = entry.query(query).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("test", request.url().pathSegments().get(2)); @@ -413,17 +326,13 @@ void testSetWorkflowStage() throws ParseException, IOException { Entry entry1 = TestClient.getClient().stack(API_KEY,MANAGEMENT_TOKEN).contentType("author").entry("entry_uid"); Request request = entry1.setWorkflowStage(body).request(); Assertions.assertNotNull(request); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("author", request.url().pathSegments().get(2)); Assertions.assertEquals("entries", request.url().pathSegments().get(3)); Assertions.assertEquals("entry_uid", request.url().pathSegments().get(4)); - Assertions.assertEquals("workflow", request.url().pathSegments().get(5)); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/author/entries/entry_uid/workflow", request.url().toString()); - } + Assertions.assertEquals("workflow", request.url().pathSegments().get(5)); } @Order(20) @Test @@ -474,9 +383,7 @@ void setWorkflowStage_VerifyQueryParams() throws ParseException { entry.addParam("locale", "en-us"); Request request = entry.setWorkflowStage(body).request(); Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("locale=en-us", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/content_types/author/entries/entry_uid/workflow?locale=en-us", request.url().toString()); - } + Assertions.assertEquals("locale=en-us", request.url().encodedQuery()); } @Order(23) @Test @@ -499,9 +406,7 @@ void testPublishRequest_ValidRequest() throws ParseException { Request request = stack.contentType("author").entry("entry_uid").publishRequest(body).request(); Assertions.assertEquals("POST", request.method()); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("author", request.url().pathSegments().get(2)); Assertions.assertEquals("entries", request.url().pathSegments().get(3)); @@ -523,9 +428,7 @@ void testPublishRequest_InvalidRequestBody() throws ParseException, IOException Assertions.assertEquals("POST", request.method()); Assertions.assertTrue(request.headers().names().contains("authorization")); Assertions.assertTrue(request.headers().names().contains("api_key")); - Assertions.assertEquals("https", request.url().scheme()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); + Assertions.assertEquals("https", request.url().scheme()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); } @Order(25) @@ -557,17 +460,12 @@ void testEntryPojo() throws IOException { Request request = contentType.entry(API_KEY).fetchAsPojo().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("test", request.url().pathSegments().get(2)); Assertions.assertEquals("entries", request.url().pathSegments().get(3)); Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - String.format("https://api.contentstack.io/v3/content_types/test/entries/"+ TestClient.API_KEY), - request.url().toString()); } @Test void testEntryPojoList() throws IOException { @@ -576,18 +474,13 @@ void testEntryPojoList() throws IOException { Request request = entry.findAsPojo().request(); Assertions.assertEquals(_COUNT, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("content_types", request.url().pathSegments().get(1)); Assertions.assertEquals("test", request.url().pathSegments().get(2)); Assertions.assertEquals("entries", request.url().pathSegments().get(3)); Assertions.assertNotNull(request.url().encodedQuery()); Assertions.assertEquals("limit=10&include_count=true", request.url().query().toString()); - Assertions.assertEquals( - String.format("https://api.contentstack.io/v3/content_types/test/entries?limit=10&include_count=true"), - request.url().toString()); } } diff --git a/src/test/java/com/contentstack/cms/stack/EnvironmentUnitTest.java b/src/test/java/com/contentstack/cms/stack/EnvironmentUnitTest.java index 015d01de..1654af76 100644 --- a/src/test/java/com/contentstack/cms/stack/EnvironmentUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/EnvironmentUnitTest.java @@ -52,30 +52,18 @@ void fetchLocales() { Request request = environment.find().request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("environments", request.url().pathSegments().get(1)); - Assertions.assertEquals("asc=created_at&include_count=false&desc=updated_at", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/environments?asc=created_at&include_count=false&desc=updated_at", - request.url().toString()); - } + Assertions.assertEquals("asc=created_at&include_count=false&desc=updated_at", request.url().encodedQuery()); } @Test void addLocale() { Request request = environment.fetch().request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("environments", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/environments/development", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void getLocale() { @@ -83,15 +71,9 @@ void getLocale() { Request request = environment.create(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("environments", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/environments", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateLocale() { @@ -99,29 +81,17 @@ void updateLocale() { Request request = environment.update(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("environments", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/environments/development", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteLocale() { Request request = environment.delete().request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("environments", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/environments/development", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } } diff --git a/src/test/java/com/contentstack/cms/stack/ExtensionAPITest.java b/src/test/java/com/contentstack/cms/stack/ExtensionAPITest.java index d4ff4a28..abc4f824 100644 --- a/src/test/java/com/contentstack/cms/stack/ExtensionAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/ExtensionAPITest.java @@ -42,16 +42,10 @@ void extensionGetAll() { Assertions.assertEquals(4, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertEquals("query=%22type%22:%22field%22&include_branch=true", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/extensions?query=%22type%22:%22field%22&include_branch=true", - request.url().toString()); - } + Assertions.assertEquals("query=%22type%22:%22field%22&include_branch=true", request.url().encodedQuery()); } @Test void getSingleWithUid() { @@ -62,15 +56,10 @@ void getSingleWithUid() { Assertions.assertEquals(4, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + AUTHTOKEN + "?include_branch=true", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void extensionUpdate() { @@ -81,15 +70,10 @@ void extensionUpdate() { Request request = extension.update(new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertEquals("query=%22type%22:%22field%22&include_branch=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + AUTHTOKEN - + "?query=%22type%22:%22field%22&include_branch=true", request.url().toString()); - } + Assertions.assertEquals("query=%22type%22:%22field%22&include_branch=true", request.url().encodedQuery()); } @Test void extensionDelete() { @@ -100,14 +84,10 @@ void extensionDelete() { Assertions.assertEquals(4, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + AUTHTOKEN, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void extensionGetSingle() { @@ -118,15 +98,10 @@ void extensionGetSingle() { Assertions.assertEquals(4, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_branch=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + AUTHTOKEN + "?include_branch=true", - request.url().toString()); - } + Assertions.assertEquals("include_branch=true", request.url().encodedQuery()); } @Test void testUploadCustomField() { @@ -151,15 +126,10 @@ public void writeTo(BufferedSink sink) { Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions?include_branch=true", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void extensionDeleteAgain() { @@ -171,13 +141,9 @@ void extensionDeleteAgain() { Assertions.assertEquals(4, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + AUTHTOKEN, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } } diff --git a/src/test/java/com/contentstack/cms/stack/ExtensionUnitTest.java b/src/test/java/com/contentstack/cms/stack/ExtensionUnitTest.java index 1599572b..a923f2e6 100644 --- a/src/test/java/com/contentstack/cms/stack/ExtensionUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/ExtensionUnitTest.java @@ -70,16 +70,10 @@ void fetchExtension() { Request request = extension.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/extensions?query=%22type%22:%22field%22&include_branch=false", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void fetcgSingleExt() { @@ -89,15 +83,9 @@ void fetcgSingleExt() { Request request = extension.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/extensions/" + _uid + "?include_count=false&include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); } @Test void extensionUpdate() { @@ -107,29 +95,19 @@ void extensionUpdate() { Request request = extension.update(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/extensions/" + _uid + "?include_count=false&include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); } @Test void extensionDelete() { Request request = extension.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void extensionGetSingle() { @@ -138,15 +116,9 @@ void extensionGetSingle() { Request request = extension.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/extensions/" + _uid + "?include_count=false&include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); } @Test void testUploadCustomField() { @@ -168,14 +140,9 @@ public void writeTo(BufferedSink sink) { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); Assertions.assertNotNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions?include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_branch=false", request.url().encodedQuery()); } // @Test // void updateTheExtension() { @@ -184,13 +151,10 @@ public void writeTo(BufferedSink sink) { // Assertions.assertEquals("POST", request.method()); // Assertions.assertNotNull(request.body()); // Assertions.assertTrue(request.url().isHttps()); - // Assertions.assertEquals("api.contentstack.io", request.url().host()); - // Assertions.assertEquals(2, request.url().pathSegments().size()); + // // Assertions.assertEquals(2, request.url().pathSegments().size()); // Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); // Assertions.assertNull(request.url().encodedQuery()); - // Assertions.assertEquals("https://api.contentstack.io/v3/extensions", - // request.url().toString()); - // } + // // } @Test void extensionDeleteAgain() { @@ -198,13 +162,9 @@ void extensionDeleteAgain() { Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); Assertions.assertNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("extensions", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/extensions/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test diff --git a/src/test/java/com/contentstack/cms/stack/GlobalFieldAPITest.java b/src/test/java/com/contentstack/cms/stack/GlobalFieldAPITest.java index 40a64f14..927601f2 100644 --- a/src/test/java/com/contentstack/cms/stack/GlobalFieldAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/GlobalFieldAPITest.java @@ -375,8 +375,7 @@ void setupNested() { // void testCreateNestedGlobalField() throws IOException { // JSONObject requestBody = Utils.readJson("globalfield/nested_global_field.json"); // Request request = nestedGlobalField.create(requestBody).request(); - // Assertions.assertEquals("https://api.contentstack.io/v3/global_fields", request.url().toString()); - // Assertions.assertEquals("/v3/global_fields", request.url().encodedPath()); + // // Assertions.assertEquals("/v3/global_fields", request.url().encodedPath()); // Assertions.assertEquals("https", request.url().scheme()); // Assertions.assertEquals("POST", request.method()); // Assertions.assertEquals(apiVersion, request.header("api_version")); @@ -390,8 +389,7 @@ void setupNested() { // nestedGlobalField.addParam("include_global_fields", true); // nestedGlobalField.addParam("include_validation_keys", true); // Request request = nestedGlobalField.fetch().request(); - // Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + nestedUid + "?include_global_fields=true&include_validation_keys=true", request.url().toString()); - // Assertions.assertEquals("https", request.url().scheme()); + // // Assertions.assertEquals("https", request.url().scheme()); // Assertions.assertEquals("GET", request.method()); // Assertions.assertEquals(apiVersion, request.header("api_version")); // Response response = nestedGlobalField.fetch().execute(); @@ -408,8 +406,7 @@ void setupNested() { // void testUpdateNestedGlobalField() throws IOException { // JSONObject requestBody = Utils.readJson("globalfield/nested_global_field_update1.json"); // Request request = nestedGlobalField.update(requestBody).request(); - // Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + nestedUid, request.url().toString()); - // Assertions.assertEquals("/v3/global_fields/" + nestedUid, request.url().encodedPath()); + // // Assertions.assertEquals("/v3/global_fields/" + nestedUid, request.url().encodedPath()); // Assertions.assertEquals("https", request.url().scheme()); // Assertions.assertEquals("PUT", request.method()); // Assertions.assertEquals(apiVersion, request.header("api_version")); @@ -425,8 +422,7 @@ void setupNested() { // @Order(4) // void testDeleteNestedGlobalField() throws IOException { // Request request = nestedGlobalField.delete().request(); - // Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + nestedUid + "?force=true", request.url().toString()); - // Assertions.assertEquals("https", request.url().scheme()); + // // Assertions.assertEquals("https", request.url().scheme()); // Assertions.assertEquals("DELETE", request.method()); // Assertions.assertEquals(apiVersion, request.header("api_version")); // Response response = nestedGlobalField.delete().execute(); diff --git a/src/test/java/com/contentstack/cms/stack/GlobalFieldUnitTests.java b/src/test/java/com/contentstack/cms/stack/GlobalFieldUnitTests.java index 48ee81ac..304ae490 100644 --- a/src/test/java/com/contentstack/cms/stack/GlobalFieldUnitTests.java +++ b/src/test/java/com/contentstack/cms/stack/GlobalFieldUnitTests.java @@ -30,9 +30,7 @@ static void setup() { @Test void testGlobalFieldFind() { - Request response = globalField.find().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields", response.url().toString()); - Assertions.assertEquals("/v3/global_fields", response.url().encodedPath()); + Request response = globalField.find().request(); Assertions.assertEquals("/v3/global_fields", response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertNull(response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); @@ -41,10 +39,7 @@ void testGlobalFieldFind() { @Test void testGlobalFieldFetch() { - Request response = globalField.fetch().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + GLOBAL_FIELD_UID, - response.url().toString()); - Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID, response.url().encodedPath()); + Request response = globalField.fetch().request(); Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID, response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertNull(response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); @@ -53,9 +48,7 @@ void testGlobalFieldFetch() { @Test void testCreate() { - Request response = globalField.create(new JSONObject()).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields", response.url().toString()); - Assertions.assertEquals("/v3/global_fields", response.url().encodedPath()); + Request response = globalField.create(new JSONObject()).request(); Assertions.assertEquals("/v3/global_fields", response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertNull(response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); @@ -64,10 +57,7 @@ void testCreate() { @Test void testUpdate() { - Request response = globalField.update(new JSONObject()).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + GLOBAL_FIELD_UID, - response.url().toString()); - Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID, response.url().encodedPath()); + Request response = globalField.update(new JSONObject()).request(); Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID, response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertNull(response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); @@ -76,10 +66,7 @@ void testUpdate() { @Test void testDelete() { - Request response = globalField.delete().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + GLOBAL_FIELD_UID + "?force=true", - response.url().toString()); - Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID, response.url().encodedPath()); + Request response = globalField.delete().request(); Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID, response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertEquals("force=true", response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); @@ -93,10 +80,7 @@ void testGlobalFieldImport() { JSONObject otherDetails = new JSONObject(); otherDetails.put("title", "technology"); globalFieldBody.put("global_field", otherDetails); - Request response = globalField.imports(globalFieldBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + AUTHTOKEN + "/export", - response.url().toString()); - Assertions.assertEquals("/v3/global_fields/" + AUTHTOKEN + "/export", response.url().encodedPath()); + Request response = globalField.imports(globalFieldBody).request(); Assertions.assertEquals("/v3/global_fields/" + AUTHTOKEN + "/export", response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertNull(response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); @@ -105,10 +89,7 @@ void testGlobalFieldImport() { @Test void testGlobalFieldExport() { - Request response = globalField.export().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/global_fields/" + GLOBAL_FIELD_UID + "/export", - response.url().toString()); - Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID + "/export", response.url().encodedPath()); + Request response = globalField.export().request(); Assertions.assertEquals("/v3/global_fields/" + GLOBAL_FIELD_UID + "/export", response.url().encodedPath()); Assertions.assertEquals("https", response.url().scheme()); Assertions.assertNull(response.url().query(), "No Query is expected"); Assertions.assertTrue(response.url().isHttps(), "Expected Https request, purely secured and trusted"); diff --git a/src/test/java/com/contentstack/cms/stack/LabelUnitTest.java b/src/test/java/com/contentstack/cms/stack/LabelUnitTest.java index 7f774bd5..75671c90 100644 --- a/src/test/java/com/contentstack/cms/stack/LabelUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/LabelUnitTest.java @@ -57,13 +57,9 @@ void getAllLabels() { Request request = label.find().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void fetchLabels() { @@ -72,14 +68,9 @@ void fetchLabels() { Request request = label.find().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels?include_count=false&include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); } @Test void fetchWithBranch() { @@ -89,14 +80,9 @@ void fetchWithBranch() { Request request = label.addBranch("main").find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels?include_count=false&include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_count=false&include_branch=false", request.url().encodedQuery()); } @Test void getLabel() { @@ -104,13 +90,9 @@ void getLabel() { Request request = label.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void getLabelWithQuery() { @@ -118,14 +100,9 @@ void getLabelWithQuery() { Request request = label.fetch().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_branch=false", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels/" + _uid + "?include_branch=false", - request.url().toString()); - } + Assertions.assertEquals("include_branch=false", request.url().encodedQuery()); } @Test void addLabelPost() { @@ -133,13 +110,9 @@ void addLabelPost() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); Assertions.assertNotNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void labelUpdate() { @@ -147,13 +120,9 @@ void labelUpdate() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); Assertions.assertNotNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void labelDelete() { @@ -161,13 +130,9 @@ void labelDelete() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); Assertions.assertNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("labels", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/labels/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test diff --git a/src/test/java/com/contentstack/cms/stack/LocaleUnitTest.java b/src/test/java/com/contentstack/cms/stack/LocaleUnitTest.java index d89a1750..17b87d48 100644 --- a/src/test/java/com/contentstack/cms/stack/LocaleUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/LocaleUnitTest.java @@ -31,15 +31,9 @@ void fetchLocales() { Request request = locale.find().request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertEquals("include_count=true", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales?include_count=true", - request.url().toString()); - } + Assertions.assertEquals("include_count=true", request.url().encodedQuery()); } @Test void addLocale() { @@ -47,15 +41,9 @@ void addLocale() { Request request = locale.create(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void getLocale() { @@ -63,15 +51,9 @@ void getLocale() { Request request = locale.fetch().request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales/en-us", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateLocale() { @@ -80,30 +62,18 @@ void updateLocale() { Request request = locale.update(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales/en-us", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteLocale() { Request request = locale.delete().request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales/en-us", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void setFallbackLocale() { @@ -111,15 +81,9 @@ void setFallbackLocale() { Request request = locale.setFallback(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateFallbackLocale() { @@ -127,15 +91,9 @@ void updateFallbackLocale() { Request request = locale.updateFallback(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); // X-User-Agent + User-Agent Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("locales", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/locales/en-us", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testLocaleException() { diff --git a/src/test/java/com/contentstack/cms/stack/PublishQueueUnitTest.java b/src/test/java/com/contentstack/cms/stack/PublishQueueUnitTest.java index 42a18a80..b14437b3 100644 --- a/src/test/java/com/contentstack/cms/stack/PublishQueueUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/PublishQueueUnitTest.java @@ -60,15 +60,10 @@ void publishQueueFetchAll() { Request request = publishQueue.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("publish-queue", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/publish-queue?publish_queue_uid=your_publish_queue_uid", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @Order(6) @@ -76,16 +71,10 @@ void publishQueueFetchByWorkflowId() { Request request = publishQueue.fetchActivity().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("publish-queue", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertEquals("publish_queue_uid=your_publish_queue_uid", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/publish-queue/" + _uid + "?publish_queue_uid=your_publish_queue_uid", - request.url().toString()); - } + Assertions.assertEquals("publish_queue_uid=your_publish_queue_uid", request.url().encodedQuery()); } @Test @Order(7) @@ -93,17 +82,10 @@ void publishQueueCancelScheduledAction() { Request request = publishQueue.cancelScheduledAction().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("publish-queue", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertEquals("publish_queue_uid=your_publish_queue_uid", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/publish-queue/" + _uid - + "/unschedule?publish_queue_uid=your_publish_queue_uid", - request.url().toString()); - } + Assertions.assertEquals("publish_queue_uid=your_publish_queue_uid", request.url().encodedQuery()); } @Test void testPublishQueueException() { diff --git a/src/test/java/com/contentstack/cms/stack/ReleaseAPITest.java b/src/test/java/com/contentstack/cms/stack/ReleaseAPITest.java index 7f3f2108..3ae47b4b 100644 --- a/src/test/java/com/contentstack/cms/stack/ReleaseAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/ReleaseAPITest.java @@ -43,11 +43,11 @@ void testCreateRelease() throws IOException, ParseException { JSONObject requestBody = Utils.readJson("releases/create_release1.json"); Response response = stack.releases().create(requestBody).execute(); - // Skip test if Releases V2 is not enabled for this stack + // Skip test if Releases V2 is not enabled if (!response.isSuccessful() && response.code() == 403) { String errorBody = response.errorBody() != null ? response.errorBody().string() : ""; if (errorBody.contains("Releases V2 is not included in your plan")) { - Assumptions.assumeTrue(false, "Skipping: Releases V2 not enabled for test credentials"); + assumeTrue(false, "Skipping: Releases V2 not enabled for test credentials"); } } @@ -70,7 +70,7 @@ void testCreateRelease() throws IOException, ParseException { void testFindReleases() throws IOException, ParseException { Response response = stack.releases().find().execute(); - // Skip test if Releases V2 is not enabled for this stack + // Skip test if Releases V2 is not enabled if (!response.isSuccessful() && response.code() == 403) { String errorBody = response.errorBody() != null ? response.errorBody().string() : ""; if (errorBody.contains("Releases V2 is not included in your plan")) { diff --git a/src/test/java/com/contentstack/cms/stack/ReleaseItemAPITest.java b/src/test/java/com/contentstack/cms/stack/ReleaseItemAPITest.java index 26e96305..5d2f37af 100644 --- a/src/test/java/com/contentstack/cms/stack/ReleaseItemAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/ReleaseItemAPITest.java @@ -36,9 +36,7 @@ void testFind() { Request request = releaseItem.find().request(); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertTrue(request.url().pathSegments().contains("items")); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertTrue(request.url().pathSegments().contains("items")); Assertions.assertTrue(request.url().toString().contains(RELEASE_UID)); Assertions.assertTrue(request.url().toString().contains("include_count=true")); } diff --git a/src/test/java/com/contentstack/cms/stack/ReleaseUnitTest.java b/src/test/java/com/contentstack/cms/stack/ReleaseUnitTest.java index 784bd391..6fd6cd23 100644 --- a/src/test/java/com/contentstack/cms/stack/ReleaseUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/ReleaseUnitTest.java @@ -79,14 +79,10 @@ void releaseQueryParams() { Request request = release.find().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases?include_rules=true&include_permissions=true", request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @Order(6) @@ -96,13 +92,9 @@ void fetchSingleUrl() { Request request = release.fetch().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid, request.url().toString()); - } + Assertions.assertEquals("v3", request.url().pathSegments().get(0)); } @Test @Order(7) @@ -110,14 +102,10 @@ void createRelease() { Request request = release.create(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(8) @@ -125,14 +113,10 @@ void updateRelease() { Request request = release.update(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(9) @@ -140,13 +124,9 @@ void deleteRelease() { Request request = release.delete().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } /// ==> Testcases for the release items <==//// @Test @@ -155,13 +135,9 @@ void getReleaseItems() { Request request = release.item().find().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid + "/items", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(10) @@ -169,13 +145,9 @@ void createItemRelease() { Request request = release.item().create(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid + "/item", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(10) @@ -183,13 +155,9 @@ void createMultipleReleaseItems() { Request request = release.item().createMultiple(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid + "/items", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(10) @@ -197,13 +165,9 @@ void updateReleaseItems() { Request request = release.item().update(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid + "/update_items", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(10) @@ -211,13 +175,9 @@ void deleteReleaseItems() { Request request = release.item().delete().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("releases", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/releases/" + _uid + "/items", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testReleaseException() { diff --git a/src/test/java/com/contentstack/cms/stack/RoleAPITest.java b/src/test/java/com/contentstack/cms/stack/RoleAPITest.java index 8964b6ce..4baa99b7 100644 --- a/src/test/java/com/contentstack/cms/stack/RoleAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/RoleAPITest.java @@ -79,14 +79,10 @@ void createRole() { Request request = roles.create(body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/roles", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateRole() { @@ -100,14 +96,10 @@ void updateRole() { Request request = roles.update(object).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/roles/" + AUTHTOKEN, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteRole() { @@ -117,14 +109,10 @@ void deleteRole() { Request request = roles.delete().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/roles/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createRoleWithRule1() throws IOException{ JSONObject requestTaxonomy = Utils.readJson("mocktaxonomy/create.json"); @@ -133,30 +121,20 @@ void createRoleWithRule1() throws IOException{ Request request = taxonomy.create(requestTaxonomy).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createRoleWithRule2() throws IOException{ JSONObject requestTerm = Utils.readJson("mocktaxonomy/createTerm.json"); Request request = term.create(requestTerm).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/sample_two/terms", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createRoleWithTaxonomy() throws IOException{ JSONObject requestBody = Utils.readJson("mockrole/createRole.json"); @@ -165,14 +143,9 @@ void createRoleWithTaxonomy() throws IOException{ Request request = roles.create(requestBody).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/roles", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } } diff --git a/src/test/java/com/contentstack/cms/stack/RoleUnitTest.java b/src/test/java/com/contentstack/cms/stack/RoleUnitTest.java index 6e50a9cc..d70b6f7b 100644 --- a/src/test/java/com/contentstack/cms/stack/RoleUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/RoleUnitTest.java @@ -164,16 +164,10 @@ void rolesQueryParams() { Request request = roles.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/roles?include_rules=true&include_permissions=true", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test @Order(6) @@ -183,15 +177,9 @@ void allRoles() { Request request = roles.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertEquals( - "https://api.contentstack.io/v3/roles?include_rules=true&include_permissions=true", - request.url().toString()); - } + Assertions.assertEquals("v3", request.url().pathSegments().get(0)); } @Test @Order(7) @@ -199,16 +187,10 @@ void singleRole() { Request request = roles.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/roles/" + _uid, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(8) @@ -219,16 +201,10 @@ void createRole() throws IOException { System.out.println(resp.toString()); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/roles", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(9) void createRoleWithTaxonomy() throws IOException { @@ -236,16 +212,10 @@ void createRoleWithTaxonomy() throws IOException { Request request = roles.create(roleBody).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/roles", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(10) @@ -253,13 +223,9 @@ void updateRole() { Request request = roles.update(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/roles/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(11) @@ -267,14 +233,9 @@ void deleteRole() { Request request = roles.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("roles", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/roles/" + _uid, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testRoleException() { diff --git a/src/test/java/com/contentstack/cms/stack/StackUnitTests.java b/src/test/java/com/contentstack/cms/stack/StackUnitTests.java index ac59c5bd..b0050ac1 100644 --- a/src/test/java/com/contentstack/cms/stack/StackUnitTests.java +++ b/src/test/java/com/contentstack/cms/stack/StackUnitTests.java @@ -59,9 +59,7 @@ void testSingleStackHeaders() { @Test void testSingleStackHost() { - Request request = stack.find().request(); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - } + Request request = stack.find().request(); } @Test void testSingleStackPort() { @@ -72,11 +70,7 @@ void testSingleStackPort() { @Test void testSingleStackUrl() { stack.clearParams(); - Request request = stack.find().request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks", - request.url().toString()); - } + Request request = stack.find().request(); } @Test void testSingleStackPathSegment() { @@ -164,9 +158,7 @@ void testCreateStackHeader() { void testCreateStackUrl() { assert ORG_ID != null; - Request request = stack.create(ORG_ID, requestBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks", request.url().toString()); - } + Request request = stack.create(ORG_ID, requestBody).request(); } @Test void testCreateStackRequestBodyCharset() { @@ -187,9 +179,7 @@ void testUpdateStackMethod() { @Test void testUpdateStackUrl() { JSONObject updateRequestBody = Utils.readJson("mockstack/update.json"); - Request request = stack.update(updateRequestBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks", request.url().toString()); - } + Request request = stack.update(updateRequestBody).request(); } @Test void testUpdateStackUrlEncodedPath() { @@ -225,11 +215,7 @@ void testTransferOwnership() { @Test void testTransferOwnershipUrl() { JSONObject ownershipBody = Utils.readJson("mockstack/ownership.json"); - Request request = stack.transferOwnership(ownershipBody).request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/transfer_ownership", - request.url().toString()); - } + Request request = stack.transferOwnership(ownershipBody).request(); } @Test void testTransferOwnershipHeaders() { @@ -250,10 +236,7 @@ void testTransferOwnershipRequestBody() { @Test void testStackSetting() { - Request request = stack.setting().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/settings", - request.url().toString()); - Assertions.assertEquals("/v3/stacks/settings", + Request request = stack.setting().request(); Assertions.assertEquals("/v3/stacks/settings", request.url().encodedPath()); Assertions.assertNull( request.url().encodedQuery()); @@ -265,10 +248,7 @@ void testStackSetting() { @Test void testStackSettingEncodedPath() { - Request request = stack.setting().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/settings", - request.url().toString()); - } + Request request = stack.setting().request(); } @Test void testStackSettingEncodedQuery() { @@ -301,10 +281,7 @@ void testUpdateSettings() { Request request = stack.updateSetting(settingBody).request(); Assertions.assertEquals("POST", request.method()); Assertions.assertEquals(443, request.url().port()); - Assertions.assertEquals("/v3/stacks/settings", request.url().encodedPath()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/settings", request.url().url().toString()); - - } + Assertions.assertEquals("/v3/stacks/settings", request.url().encodedPath()); } @Test void testUpdateSettingMethod() { @@ -332,11 +309,7 @@ void testUpdateSettingEncodedPath() { @Test void testUpdateSettingRequestUrl() { JSONObject settingBody = Utils.readJson("mockstack/setting.json"); - Request request = stack.updateSetting(settingBody).request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/settings", request.url().url().toString()); - - } + Request request = stack.updateSetting(settingBody).request(); } @Test void testResetStackSettings() { @@ -344,10 +317,7 @@ void testResetStackSettings() { Request request = stack.resetSetting(resetSettingBody).request(); Assertions.assertEquals("POST", request.method()); Assertions.assertEquals(443, request.url().port()); - Assertions.assertEquals("/v3/stacks/settings", request.url().encodedPath()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/settings", request.url().url().toString()); - - } + Assertions.assertEquals("/v3/stacks/settings", request.url().encodedPath()); } @Test void testResetStackSettingMethod() { @@ -373,10 +343,7 @@ void testResetEncodedPath() { @Test void testResetRequestUrl() { JSONObject resetSettingBody = Utils.readJson("mockstack/reset_setting.json"); - Request request = stack.resetSetting(resetSettingBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/settings", request.url().url().toString()); - - } + Request request = stack.resetSetting(resetSettingBody).request(); } @Test void testShareStack() { @@ -384,9 +351,7 @@ void testShareStack() { Request request = stack.share(shareStackBody).request(); Assertions.assertEquals("POST", request.method()); Assertions.assertEquals(443, request.url().port()); - Assertions.assertEquals("/v3/stacks/share", request.url().encodedPath()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/share", request.url().url().toString()); - } + Assertions.assertEquals("/v3/stacks/share", request.url().encodedPath()); } @Test void testShareMethod() { @@ -412,9 +377,7 @@ void testShareStackEncodedUrl() { @Test void testShareStackCompleteUrl() { JSONObject shareStackBody = Utils.readJson("mockstack/share_stack.json"); - Request request = stack.share(shareStackBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/share", request.url().url().toString()); - } + Request request = stack.share(shareStackBody).request(); } @Test void testUnshareStack() { @@ -422,10 +385,7 @@ void testUnshareStack() { Request request = stack.unshare(unshareRequestBody).request(); Assertions.assertEquals("POST", request.method()); Assertions.assertEquals(443, request.url().port()); - Assertions.assertEquals("/v3/stacks/unshare", request.url().encodedPath()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/unshare", request.url().url().toString()); - - } + Assertions.assertEquals("/v3/stacks/unshare", request.url().encodedPath()); } @Test void testUnshareStackMethod() { @@ -451,20 +411,14 @@ void testUnshareStackEncodedUrl() { @Test void testUnshareStackCompleteUrl() { JSONObject unshareRequestBody = Utils.readJson("mockstack/unshare.json"); - Request request = stack.unshare(unshareRequestBody).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/unshare", request.url().url().toString()); - } + Request request = stack.unshare(unshareRequestBody).request(); } @Test void testGetAllUsers() { Request request = stack.allUsers().request(); Assertions.assertEquals("GET", request.method()); Assertions.assertEquals(443, request.url().port()); - Assertions.assertEquals("/v3/stacks", request.url().encodedPath()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks?include_collaborators=true", - request.url().url().toString()); - - } + Assertions.assertEquals("/v3/stacks", request.url().encodedPath()); } @Test void testGetAllUsersMethod() { @@ -486,11 +440,7 @@ void testGetAllUserEncodedPath() { @Test void testGetAllUserCompleteUrl() { - Request request = stack.allUsers().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks?include_collaborators=true", - request.url().url().toString()); - - } + Request request = stack.allUsers().request(); } @Test void testUpdateUserRoles() { @@ -498,10 +448,7 @@ void testUpdateUserRoles() { Request request = stack.roles(updateUserRole).request(); Assertions.assertEquals("POST", request.method()); Assertions.assertEquals(443, request.url().port()); - Assertions.assertEquals("/v3/stacks/users/roles", request.url().encodedPath()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/users/roles", request.url().url().toString()); - - } + Assertions.assertEquals("/v3/stacks/users/roles", request.url().encodedPath()); } @Test void testUpdateUserRolesMethod() { @@ -527,9 +474,7 @@ void testUpdateUserRolesEncodedUrl() { @Test void testUpdateUserRolesCompleteUrl() { JSONObject updateUserRole = Utils.readJson("mockstack/update_user_role.json"); - Request request = stack.roles(updateUserRole).request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/users/roles", request.url().url().toString()); - } + Request request = stack.roles(updateUserRole).request(); } @Test void testAcceptOwnership() { @@ -565,12 +510,7 @@ void testAcceptOwnershipCompleteUrl() { stack.clearParams(); stack.addParam("api_key", apiKey); stack.addParam("uid", USER_ID); - Request request = stack.acceptOwnership(ORG_ID).request(); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/accept_ownership/" + ORG_ID + "?uid=" + USER_ID - + "&api_key=" + stack.headers.get("api_key").toString() + "", - request.url().url().toString()); - } + Request request = stack.acceptOwnership(ORG_ID).request(); } @Test diff --git a/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java b/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java index 1676e577..c1d61f3c 100644 --- a/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java @@ -77,15 +77,10 @@ void createTaxonomy() throws IOException { Request request = taxonomy.create(requestBody).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateTaxonomy() { @@ -95,15 +90,10 @@ void updateTaxonomy() { Request request = taxonomy.update("sample_one",updateBody).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/sample_one", request.url().toString()); - - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteTaxonomy(){ @@ -120,14 +110,10 @@ void deleteTaxonomy(){ Request request = taxonomy.delete("sample_one").request(); Assertions.assertEquals(5, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/sample_one", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createTerm() throws IOException { @@ -136,18 +122,13 @@ void createTerm() throws IOException { Request request = terms.create(term).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void fetchAllTerms() throws IOException { terms.clearParams(); @@ -155,18 +136,13 @@ void fetchAllTerms() throws IOException { Request request = terms.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); - Assertions.assertEquals("limit=3", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms?limit=3", - request.url().toString()); - } + Assertions.assertEquals("limit=3", request.url().encodedQuery()); } @Test void fetchSingleTerm() throws IOException { @@ -174,17 +150,12 @@ void fetchSingleTerm() throws IOException { Request request = terms.fetch("india").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/india", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateTerm(){ @@ -192,34 +163,25 @@ void updateTerm(){ Request request = terms.update(_uid,Newterm).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/sample_one", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteTerm(){ Request request = taxonomy.delete("sample_one").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void ancestorsTerm(){ @@ -229,21 +191,14 @@ void ancestorsTerm(){ Request request = terms.ancestors("term_a2").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); Assertions.assertEquals("include_children_count=false&include_referenced_entries_count=true", - request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/term_a2/ancestors?include_children_count=false&include_referenced_entries_count=true", - request.url().toString()); - - } + request.url().encodedQuery()); } @Test void descendantsTerm(){ @@ -252,20 +207,13 @@ void descendantsTerm(){ Request request = terms.descendants("term_a2").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); - Assertions.assertEquals("include_count=true", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/term_a2/descendants?include_count=true", - request.url().toString()); - - } + Assertions.assertEquals("include_count=true", request.url().encodedQuery()); } @Test void moveTerms(){ @@ -280,8 +228,6 @@ void moveTerms(){ Request request = terms.reorder(_uid, new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); } } diff --git a/src/test/java/com/contentstack/cms/stack/TaxonomyTest.java b/src/test/java/com/contentstack/cms/stack/TaxonomyTest.java index 13d10a10..693a7db6 100644 --- a/src/test/java/com/contentstack/cms/stack/TaxonomyTest.java +++ b/src/test/java/com/contentstack/cms/stack/TaxonomyTest.java @@ -56,16 +56,10 @@ void findTest() { Request request = taxonomy.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies?include_rules=true&include_permissions=true", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void findTestWithParams() { @@ -75,16 +69,10 @@ void findTestWithParams() { Request request = taxonomy.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies?limit=2&skip=2&include_count=false", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void findTestCustomParams() { @@ -94,60 +82,40 @@ void findTestCustomParams() { Request request = taxonomy.find().request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies?include_rules=true&include_permissions=true", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void fetchTest() { Request request = taxonomy.fetch("taxonomyId").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNotNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies/taxonomyId?limit=2&skip=2&include_count=false", - request.url().toString()); - } + Assertions.assertNotNull(request.url().encodedQuery()); } @Test void updateTest() { Request request = taxonomy.update("taxonomyId", body).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/taxonomyId", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteTest() { Request request = taxonomy.delete("taxonomyId").request(); Assertions.assertEquals(5, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/taxonomyId", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteTestWithHeaders() { @@ -164,14 +132,10 @@ void deleteTestWithHeaders() { Request request = taxonomy.delete("taxonomyId").request(); Assertions.assertEquals(5, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/taxonomyId", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createTest() { @@ -180,13 +144,9 @@ void createTest() { Request request = taxonomy.create(obj).request(); Assertions.assertEquals(4, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testCreateTerm() { @@ -201,18 +161,13 @@ void testCreateTerm() { Request request = terms.create(term).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/auth999999999/terms", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testFindTerm() { @@ -221,18 +176,13 @@ void testFindTerm() { Request request = terms.find().request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); - Assertions.assertEquals("limit=3", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/" + _uid + "/terms?limit=3", - request.url().toString()); - } + Assertions.assertEquals("limit=3", request.url().encodedQuery()); } @Test void testFetchTerm() { @@ -242,20 +192,14 @@ void testFetchTerm() { Request request = terms.fetch(_uid).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); Assertions.assertEquals("include_children_count=false&include_referenced_entries_count=true", - request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies/auth999999999/terms/auth999999999?include_children_count=false&include_referenced_entries_count=true", - request.url().toString()); - } + request.url().encodedQuery()); } @Test void testTermUpdate() { @@ -272,9 +216,7 @@ void testTermUpdate() { Request request = terms.update(_uid, new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(5, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size()); } @@ -291,9 +233,7 @@ void testTermMoveOrReorder() { Request request = terms.reorder(_uid, new JSONObject()).request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); } @Test @@ -302,9 +242,7 @@ void testTermSearch() { Request request = terms.search("contentstack").request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); } @Test @@ -314,19 +252,13 @@ void testDescendantsTerm() { Request request = terms.descendants("termId45").request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); - Assertions.assertEquals("include_count=true", request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies/auth999999999/terms/termId45/descendants?include_count=true", - request.url().toString()); - } + Assertions.assertEquals("include_count=true", request.url().encodedQuery()); } @Test void testAncestorsTerm() { @@ -336,20 +268,14 @@ void testAncestorsTerm() { Request request = terms.ancestors("termId45").request(); Assertions.assertEquals(3, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(6, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals(_uid, request.url().pathSegments().get(2)); Assertions.assertEquals("terms", request.url().pathSegments().get(3)); Assertions.assertNull(request.body()); Assertions.assertEquals("include_children_count=false&include_referenced_entries_count=true", - request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/taxonomies/auth999999999/terms/termId45/ancestors?include_children_count=false&include_referenced_entries_count=true", - request.url().toString()); - } + request.url().encodedQuery()); } @Test void findTestAPI() throws IOException { @@ -376,9 +302,7 @@ void queryFiltersOnTaxonomy() { Request request = taxonomy.query(query).request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1)); Assertions.assertEquals("entries", request.url().pathSegments().get(2)); diff --git a/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java b/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java index 492919ab..569e7e81 100644 --- a/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java @@ -93,89 +93,57 @@ void allDeliveryTokens() { Request request = tokens.deliveryTokens().find().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/delivery_tokens", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void singleDeliveryToken() { Request request = tokens.deliveryTokens(_uid).fetch().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid, - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createDeliveryToken() { Request request = tokens.deliveryTokens().create(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1)); Assertions.assertNotNull(request.body()); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/stacks/delivery_tokens", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateDeliveryToken() { Request request = tokens.deliveryTokens(_uid).update(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteDeliveryToken() { Request request = tokens.deliveryTokens(_uid).delete().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1)); - Assertions.assertEquals("force=false", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid + "?force=false", - request.url().toString()); - } + Assertions.assertEquals("force=false", request.url().encodedQuery()); } @Test void deleteDeliveryTokenForcefully() { Request request = tokens.deliveryTokens(_uid).delete(true).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1)); - Assertions.assertEquals("force=true", request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid + "?force=true", - request.url().toString()); - } + Assertions.assertEquals("force=true", request.url().encodedQuery()); } @Test void allManagementToken() { @@ -183,14 +151,9 @@ void allManagementToken() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); Assertions.assertNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void singleManagementToken() { @@ -198,13 +161,9 @@ void singleManagementToken() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); Assertions.assertNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void createManagementToken() { @@ -212,13 +171,9 @@ void createManagementToken() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); Assertions.assertNotNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void updateManagementToken() { @@ -226,13 +181,9 @@ void updateManagementToken() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); Assertions.assertNotNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void deleteManagementToken() { @@ -240,13 +191,9 @@ void deleteManagementToken() { Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); Assertions.assertNull(request.body()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void testHeaderAndParams() { @@ -256,8 +203,5 @@ void testHeaderAndParams() { deliveryToken.addHeader("headerKey", "headerValue"); deliveryToken.addParam("key", "Value"); deliveryToken.removeParam("key"); - Request request = tokens.deliveryTokens().find().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens", - request.url().toString()); - } + Request request = tokens.deliveryTokens().find().request(); } } diff --git a/src/test/java/com/contentstack/cms/stack/VariantGroupAPITest.java b/src/test/java/com/contentstack/cms/stack/VariantGroupAPITest.java index 7bd7c062..e2b81822 100644 --- a/src/test/java/com/contentstack/cms/stack/VariantGroupAPITest.java +++ b/src/test/java/com/contentstack/cms/stack/VariantGroupAPITest.java @@ -21,23 +21,17 @@ void testFetchVariantGroups() throws IOException, InterruptedException { variantGroup.addParam("include_count", true); variantGroup.addParam("include_variant_info", true); Request request = variantGroup.find().request(); - Assertions.assertEquals("GET", request.method()); - Assertions.assertEquals("https://api.contentstack.io/v3/variant_groups?include_variant_info=true&include_count=true", request.url().toString()); - } + Assertions.assertEquals("GET", request.method()); } @Test void testLinkContentTypes() throws IOException, InterruptedException { VariantGroup variantGroupWithUID = TestClient.getClient().stack(API_KEY, MANAGEMENT_TOKEN).variantGroup(VARIANT_GROUP_UID); Request request = variantGroupWithUID.linkContentTypes("author", "page").request(); - Assertions.assertEquals("PUT", request.method()); - Assertions.assertEquals("https://api.contentstack.io/v3/variant_groups/" + VARIANT_GROUP_UID + "/variants", request.url().toString()); - } + Assertions.assertEquals("PUT", request.method()); } @Test void testUnlinkContentTypes() throws IOException, InterruptedException { VariantGroup variantGroupWithUID = TestClient.getClient().stack(API_KEY, MANAGEMENT_TOKEN).variantGroup(VARIANT_GROUP_UID); Request request = variantGroupWithUID.unlinkContentTypes("author", "page").request(); - Assertions.assertEquals("PUT", request.method()); - Assertions.assertEquals("https://api.contentstack.io/v3/variant_groups/" + VARIANT_GROUP_UID + "/variants", request.url().toString()); - } + Assertions.assertEquals("PUT", request.method()); } } \ No newline at end of file diff --git a/src/test/java/com/contentstack/cms/stack/VariantGroupTest.java b/src/test/java/com/contentstack/cms/stack/VariantGroupTest.java index 5bb5ca03..d799983b 100644 --- a/src/test/java/com/contentstack/cms/stack/VariantGroupTest.java +++ b/src/test/java/com/contentstack/cms/stack/VariantGroupTest.java @@ -61,13 +61,7 @@ void testUnlinkContentTypes_WithEmptyArray() { @Test void testLinkContentTypes_SingleContentType() throws IOException { Request request = variantGroup.linkContentTypes("test_content_type").request(); - Assertions.assertEquals("PUT", request.method()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/variant_groups/" + VARIANT_GROUP_UID + "/variants", - request.url().toString() - ); - - Assertions.assertNotNull(request.body(), "Request body should not be null"); + Assertions.assertEquals("PUT", request.method()); Assertions.assertNotNull(request.body(), "Request body should not be null"); Buffer buffer = new Buffer(); request.body().writeTo(buffer); String requestBody = buffer.readUtf8(); @@ -84,13 +78,7 @@ void testLinkContentTypes_SingleContentType() throws IOException { @Test void testUnlinkContentTypes_MultipleContentTypes() throws IOException { Request request = variantGroup.unlinkContentTypes("type1", "type2", "type3").request(); - Assertions.assertEquals("PUT", request.method()); - Assertions.assertEquals( - "https://api.contentstack.io/v3/variant_groups/" + VARIANT_GROUP_UID + "/variants", - request.url().toString() - ); - - Assertions.assertNotNull(request.body(), "Request body should not be null"); + Assertions.assertEquals("PUT", request.method()); Assertions.assertNotNull(request.body(), "Request body should not be null"); Buffer buffer = new Buffer(); request.body().writeTo(buffer); String requestBody = buffer.readUtf8(); diff --git a/src/test/java/com/contentstack/cms/stack/WebhookUnitTest.java b/src/test/java/com/contentstack/cms/stack/WebhookUnitTest.java index 48710802..231a4d5a 100644 --- a/src/test/java/com/contentstack/cms/stack/WebhookUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/WebhookUnitTest.java @@ -113,9 +113,7 @@ void fetchWebhook() { Request request = webhook.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertEquals("include_rules=true&include_permissions=true", request.url().encodedQuery()); @@ -131,9 +129,7 @@ void fetchByWebhookUid() { Request request = webhook.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -146,9 +142,7 @@ void createWebhook() { Request request = webhook.create(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -162,9 +156,7 @@ void updateWebhook() { Request request = webhook.update(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -178,9 +170,7 @@ void deleteWebhook() { Request request = webhook.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -194,9 +184,7 @@ void exportWebhook() { Request request = webhook.export().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -239,9 +227,7 @@ void importWebhook() { Request request = webhook.importWebhook("webhook", line).request(); Assertions.assertEquals(2, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -253,23 +239,17 @@ void importExistingWebhook() { Request request = webhook.importExisting().request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/webhooks/import", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test void getExecutionWebhook() { Request request = webhook.getExecutions().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -281,9 +261,7 @@ void retryLogWebhook() { Request request = webhook.retry(_webhook_uid).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -295,9 +273,7 @@ void getExecutionLogWebhook() { Request request = webhook.getExecutionLog(_webhook_uid).request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("webhooks", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); diff --git a/src/test/java/com/contentstack/cms/stack/WorkflowUnitTest.java b/src/test/java/com/contentstack/cms/stack/WorkflowUnitTest.java index 89a19ae7..ce88ce7c 100644 --- a/src/test/java/com/contentstack/cms/stack/WorkflowUnitTest.java +++ b/src/test/java/com/contentstack/cms/stack/WorkflowUnitTest.java @@ -152,14 +152,10 @@ void workflowFetchAll() { Request request = workflow.find().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(6) @@ -167,14 +163,10 @@ void workflowFetchByWorkflowId() { Request request = workflow.fetch().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(7) @@ -182,14 +174,10 @@ void workflowCreate() { Request request = workflow.create(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(2, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(8) @@ -197,14 +185,10 @@ void workflowUpdate() { Request request = workflow.update(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(9) @@ -212,15 +196,10 @@ void workflowDisable() { Request request = workflow.disable().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/" + _uid + "/disable", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(10) @@ -228,15 +207,10 @@ void workflowEnable() { Request request = workflow.enable().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/" + _uid + "/enable", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(11) @@ -244,14 +218,10 @@ void workflowDelete() { Request request = workflow.delete().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/" + _uid, request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(13) @@ -259,14 +229,10 @@ void workflowCreatePublishRule() { Request request = workflow.createPublishRule(body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("POST", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/publishing_rules", request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(14) @@ -274,15 +240,10 @@ void workflowUpdatePublishRule() { Request request = workflow.updatePublishRule("ruleUid", body).request(); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertEquals("PUT", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/publishing_rules/ruleUid", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(15) @@ -290,15 +251,10 @@ void workflowDeletePublishRule() { Request request = workflow.deletePublishRule("ruleUid").request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("DELETE", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); - Assertions.assertNull(request.url().encodedQuery()); - Assertions.assertEquals("https://api.contentstack.io/v3/workflows/publishing_rules/ruleUid", - request.url().toString()); - } + Assertions.assertNull(request.url().encodedQuery()); } @Test @Order(16) @@ -307,9 +263,7 @@ void workflowFetchPublishRules() { Request request = workflow.fetchPublishRules(contentTypes).request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(3, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNotNull(request.url().encodedQuery()); @@ -322,9 +276,7 @@ void workflowFetchPublishRule() { Request request = workflow.fetchPublishRule("ruleUid").request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNull(request.url().encodedQuery()); @@ -337,9 +289,7 @@ void workflowFetchPublishRuleContentType() { Request request = workflow.fetchPublishRuleContentType("contentTypeUid").request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNotNull(request.url().encodedQuery()); @@ -352,9 +302,7 @@ void workflowFetchTasks() { Request request = workflow.fetchTasks().request(); Assertions.assertEquals(1, request.headers().names().size()); Assertions.assertEquals("GET", request.method()); - Assertions.assertTrue(request.url().isHttps()); - Assertions.assertEquals("api.contentstack.io", request.url().host()); - Assertions.assertEquals(4, request.url().pathSegments().size()); + Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size()); Assertions.assertEquals("workflows", request.url().pathSegments().get(1)); Assertions.assertEquals("v3", request.url().pathSegments().get(0)); Assertions.assertNotNull(request.url().encodedQuery()); diff --git a/src/test/java/com/contentstack/cms/user/UserApiTest.java b/src/test/java/com/contentstack/cms/user/UserApiTest.java index 47b3f729..44462dcc 100644 --- a/src/test/java/com/contentstack/cms/user/UserApiTest.java +++ b/src/test/java/com/contentstack/cms/user/UserApiTest.java @@ -37,9 +37,7 @@ JSONObject strToJson(String body) { @Test @Order(3) void testGetUser() { - Request request = user.getUser().request(); - Assertions.assertEquals("https://api.contentstack.io/v3/user", request.url().toString()); - Assertions.assertEquals("GET", request.method()); + Request request = user.getUser().request(); Assertions.assertEquals("GET", request.method()); Assertions.assertEquals(0, request.headers().names().size()); Assertions.assertNull(request.body()); Assertions.assertNull(request.url().query()); @@ -55,10 +53,7 @@ void testUpdateUser() { "}"; JSONObject jsonBody = strToJson(body); Request userLogin = user.update(jsonBody).request(); - Assertions.assertTrue(userLogin.isHttps()); - Assertions.assertEquals("https://api.contentstack.io/v3/user", userLogin.url().toString().replace("\"", "")); - - } + Assertions.assertTrue(userLogin.isHttps()); } @Test @Order(5) diff --git a/src/test/java/com/contentstack/cms/user/UserUnitTests.java b/src/test/java/com/contentstack/cms/user/UserUnitTests.java index 150eea96..19b0157d 100644 --- a/src/test/java/com/contentstack/cms/user/UserUnitTests.java +++ b/src/test/java/com/contentstack/cms/user/UserUnitTests.java @@ -84,9 +84,7 @@ void testUserClassWithGetUserContainingAllParameters() { @Order(2) @DisplayName("tests url from getUser method") void testUserClassWithGetUserContainingHost() { - Request requestInfo = userInstance.getUser().request(); - Assertions.assertEquals("api.contentstack.io", requestInfo.url().host()); - } + Request requestInfo = userInstance.getUser().request(); } @Test @Order(3) @@ -152,9 +150,7 @@ void testUserClassWithUpdateUserContainingHost() { "\t}\n" + "}"; JSONObject body = strToJson(strBody); - Request requestInfo = userInstance.update(body).request(); - Assertions.assertEquals("api.contentstack.io", requestInfo.url().host()); - } + Request requestInfo = userInstance.update(body).request(); } @Test @Order(8) @@ -234,11 +230,7 @@ void testUserClassWithActivateUserContainingHost() { Request requestInfo = userInstance .activateAccount(ACTIVATION_TOKEN, body) .request(); - Assertions - .assertEquals("api.contentstack.io", - requestInfo.url().host()); - Assertions - .assertEquals("/v3/user/activate/" + ACTIVATION_TOKEN, + Assertions.assertEquals("/v3/user/activate/" + ACTIVATION_TOKEN, requestInfo.url().encodedPath()); } @@ -326,11 +318,7 @@ void testUserClassWithRequestPasswordContainingHost() { Request requestInfo = userInstance .requestPassword(body) .request(); - Assertions - .assertEquals("api.contentstack.io", - requestInfo.url().host()); - Assertions - .assertEquals("/v3/user/forgot_password", + Assertions.assertEquals("/v3/user/forgot_password", requestInfo.url().encodedPath()); } @@ -409,11 +397,7 @@ void testUserClassWithResetPasswordContainingHost() { "}"; JSONObject body = strToJson(requestBody); Request requestInfo = userInstance.resetPassword(body).request(); - Assertions - .assertEquals("api.contentstack.io", - requestInfo.url().host()); - Assertions - .assertEquals("/v3/user/reset_password", + Assertions.assertEquals("/v3/user/reset_password", requestInfo.url().encodedPath()); } @@ -486,9 +470,7 @@ void testUserClassWithLogoutContainingAllParameters() { @Order(32) @DisplayName("tests url from Logout method") void testUserClassWithLogoutContainingHost() { - Request requestInfo = userInstance.logout().request(); - Assertions.assertEquals("api.contentstack.io", requestInfo.url().host()); - Assertions.assertEquals("/v3/user-session", requestInfo.url().encodedPath()); + Request requestInfo = userInstance.logout().request(); Assertions.assertEquals("/v3/user-session", requestInfo.url().encodedPath()); } @Test @@ -540,11 +522,7 @@ void testUserClassWithLogoutWithAuthtokenContainingHost() { Request requestInfo = userInstance .logoutWithAuthtoken("authtoken") .request(); - Assertions - .assertEquals("api.contentstack.io", - requestInfo.url().host()); - Assertions - .assertEquals("/v3/user-session", + Assertions.assertEquals("/v3/user-session", requestInfo.url().encodedPath()); }