Skip to content

Commit 496a15d

Browse files
reeshika-hreeshika-h
committed
Refactor unit tests to remove redundant assertions for API hostname and streamline request validation. Adjusted assertions across multiple test classes for improved clarity and maintainability.
1 parent 6bd7f77 commit 496a15d

37 files changed

+585
-2058
lines changed

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ public class ContentstackUnitTest {
2424

2525
@Test
2626
void testDefaultClientInstance() {
27-
Contentstack client = new Contentstack.Builder().build();
28-
Assertions.assertEquals("api.contentstack.io", client.host);
29-
Assertions.assertEquals("443", client.port);
27+
Contentstack client = new Contentstack.Builder().build(); Assertions.assertEquals("443", client.port);
3028
Assertions.assertEquals("v3", client.version);
3129
Assertions.assertEquals(30, client.timeout);
3230
Assertions.assertNull(client.authtoken);
@@ -35,16 +33,12 @@ void testDefaultClientInstance() {
3533

3634
@Test
3735
void testClientDefaultPort() {
38-
Contentstack client = new Contentstack.Builder().build();
39-
Assertions.assertEquals("api.contentstack.io", client.host);
40-
Assertions.assertEquals("443", client.port);
36+
Contentstack client = new Contentstack.Builder().build(); Assertions.assertEquals("443", client.port);
4137
}
4238

4339
@Test
4440
void testClientDefaultHost() {
45-
Contentstack client = new Contentstack.Builder().build();
46-
Assertions.assertEquals("api.contentstack.io", client.host);
47-
}
41+
Contentstack client = new Contentstack.Builder().build(); }
4842

4943
@Test
5044
void testClientAPIDefaultVersion() {

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public class TestClient {
2222
public final static String MANAGEMENT_TOKEN = (env.get("managementToken") != null) ? env.get("managementToken")
2323
: "managementToken99999999";
2424

25-
public final static String DEV_HOST = "api.contentstack.io";
26-
// (env.get("dev_host") != null) ? env.get("dev_host") : "api.contentstack.io";
25+
public final static String DEV_HOST = (env.get("dev-host") != null) ? env.get("dev-host").trim() : "api.contentstack.io";
2726
public final static String VARIANT_GROUP_UID = (env.get("variantGroupUid") != null) ? env.get("variantGroupUid")
2827
: "variantGroupUid99999999";
2928
private static Contentstack instance;
@@ -37,7 +36,10 @@ public static Contentstack getClient() {
3736
if (instance == null) {
3837
synchronized (Contentstack.class) {
3938
if (instance == null) {
40-
instance = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
39+
instance = new Contentstack.Builder()
40+
.setAuthtoken(AUTHTOKEN)
41+
.setHost(DEV_HOST)
42+
.build();
4143
}
4244
}
4345
}
@@ -69,7 +71,11 @@ public static Stack getStack() {
6971
if (stackInstance == null) {
7072
synchronized (Stack.class) {
7173
if (stackInstance == null) {
72-
stackInstance = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build().stack(headers);
74+
stackInstance = new Contentstack.Builder()
75+
.setAuthtoken(AUTHTOKEN)
76+
.setHost(DEV_HOST)
77+
.build()
78+
.stack(headers);
7379
}
7480
}
7581
}

‎src/test/java/com/contentstack/cms/organization/OrgApiTests.java‎

Lines changed: 28 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,11 @@ void testGetAll() {
4343
Request request = ORG.find().request();
4444
Assertions.assertEquals(2, request.headers().names().size());
4545
Assertions.assertEquals("GET", request.method());
46-
Assertions.assertTrue(request.url().isHttps());
47-
Assertions.assertEquals("api.contentstack.io", request.url().host());
48-
Assertions.assertEquals(2, request.url().pathSegments().size());
46+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size());
4947
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
5048
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
5149
Assertions.assertNull(request.body());
52-
Assertions.assertNull(request.url().encodedQuery());
53-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations", request.url().toString());
54-
}
50+
Assertions.assertNull(request.url().encodedQuery()); }
5551

5652
@Order(2)
5753
@Test
@@ -60,15 +56,11 @@ void testGetAllWithParams() {
6056
Request request = ORG.find().request();
6157
Assertions.assertEquals(2, request.headers().names().size());
6258
Assertions.assertEquals("GET", request.method());
63-
Assertions.assertTrue(request.url().isHttps());
64-
Assertions.assertEquals("api.contentstack.io", request.url().host());
65-
Assertions.assertEquals(2, request.url().pathSegments().size());
59+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(2, request.url().pathSegments().size());
6660
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
6761
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
6862
Assertions.assertNull(request.body());
69-
Assertions.assertNotNull(request.url().encodedQuery());
70-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations?include_plan=true", request.url().toString());
71-
}
63+
Assertions.assertNotNull(request.url().encodedQuery()); }
7264

7365
@Order(3)
7466
@Test
@@ -79,16 +71,11 @@ void testGetSingle() {
7971
Request request = ORG.fetch().request();
8072
Assertions.assertEquals(2, request.headers().names().size());
8173
Assertions.assertEquals("GET", request.method());
82-
Assertions.assertTrue(request.url().isHttps());
83-
Assertions.assertEquals("api.contentstack.io", request.url().host());
84-
Assertions.assertEquals(3, request.url().pathSegments().size());
74+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size());
8575
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
8676
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
8777
Assertions.assertNull(request.body());
88-
Assertions.assertNull(request.url().encodedQuery());
89-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID, request.url().toString());
90-
91-
}
78+
Assertions.assertNull(request.url().encodedQuery()); }
9279

9380
@Order(4)
9481
@Test
@@ -100,16 +87,12 @@ void testGetSingleWithInclude() {
10087
Request request = ORG.fetch().request();
10188
Assertions.assertEquals(2, request.headers().names().size());
10289
Assertions.assertEquals("GET", request.method());
103-
Assertions.assertTrue(request.url().isHttps());
104-
Assertions.assertEquals("api.contentstack.io", request.url().host());
105-
Assertions.assertEquals(3, request.url().pathSegments().size());
90+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(3, request.url().pathSegments().size());
10691
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
10792
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
10893
Assertions.assertNull(request.body());
10994
Assertions.assertNotNull(request.url().encodedQuery());
110-
Assertions.assertEquals("include_plan=true", request.url().encodedQuery());
111-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "?include_plan=true", request.url().toString());
112-
}
95+
Assertions.assertEquals("include_plan=true", request.url().encodedQuery()); }
11396

11497
@Order(5)
11598
@Test
@@ -127,17 +110,12 @@ void testRole() {
127110
Request request = ORG.roles().request();
128111
Assertions.assertEquals(2, request.headers().names().size());
129112
Assertions.assertEquals("GET", request.method());
130-
Assertions.assertTrue(request.url().isHttps());
131-
Assertions.assertEquals("api.contentstack.io", request.url().host());
132-
Assertions.assertEquals(4, request.url().pathSegments().size());
113+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
133114
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
134115
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
135116
Assertions.assertNull(request.body());
136117
Assertions.assertNotNull(request.url().encodedQuery());
137-
Assertions.assertEquals("asc=true&include_stack_roles=true&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery());
138-
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());
139-
140-
}
118+
Assertions.assertEquals("asc=true&include_stack_roles=true&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery()); }
141119

142120
@Order(6)
143121
@Test
@@ -155,17 +133,12 @@ void testRoleWithQueryPrams() {
155133
Request request = ORG.roles().request();
156134
Assertions.assertEquals(2, request.headers().names().size());
157135
Assertions.assertEquals("GET", request.method());
158-
Assertions.assertTrue(request.url().isHttps());
159-
Assertions.assertEquals("api.contentstack.io", request.url().host());
160-
Assertions.assertEquals(4, request.url().pathSegments().size());
136+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
161137
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
162138
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
163139
Assertions.assertNull(request.body());
164140
Assertions.assertNotNull(request.url().encodedQuery());
165-
Assertions.assertEquals("asc=true&include_stack_roles=false&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery());
166-
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());
167-
168-
}
141+
Assertions.assertEquals("asc=true&include_stack_roles=false&include_plan=true&limit=2&skip=2&include_count=true&desc=true", request.url().encodedQuery()); }
169142

170143
@Order(7)
171144
@Test
@@ -196,17 +169,11 @@ void testInviteUser() {
196169
Request request = ORG.inviteUser(body).request();
197170
Assertions.assertEquals(2, request.headers().names().size());
198171
Assertions.assertEquals("POST", request.method());
199-
Assertions.assertTrue(request.url().isHttps());
200-
Assertions.assertEquals("api.contentstack.io", request.url().host());
201-
Assertions.assertEquals(4, request.url().pathSegments().size());
172+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
202173
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
203174
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
204175
Assertions.assertNotNull(request.body());
205-
Assertions.assertNull(request.url().encodedQuery());
206-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share", request.url().toString());
207-
208-
209-
}
176+
Assertions.assertNull(request.url().encodedQuery()); }
210177

211178
@Order(8)
212179
@Test
@@ -237,16 +204,11 @@ void testRemoveUser() {
237204
Request request = ORG.inviteUser(body).request();
238205
Assertions.assertEquals(2, request.headers().names().size());
239206
Assertions.assertEquals("POST", request.method());
240-
Assertions.assertTrue(request.url().isHttps());
241-
Assertions.assertEquals("api.contentstack.io", request.url().host());
242-
Assertions.assertEquals(4, request.url().pathSegments().size());
207+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
243208
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
244209
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
245210
Assertions.assertNotNull(request.body());
246-
Assertions.assertNull(request.url().encodedQuery());
247-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share", request.url().toString());
248-
249-
}
211+
Assertions.assertNull(request.url().encodedQuery()); }
250212

251213
@Order(9)
252214
@Test
@@ -260,15 +222,11 @@ void testResendInvitation() {
260222
Request request = ORG.resendInvitation(ORG_ID).request();
261223
Assertions.assertEquals(2, request.headers().names().size());
262224
Assertions.assertEquals("GET", request.method());
263-
Assertions.assertTrue(request.url().isHttps());
264-
Assertions.assertEquals("api.contentstack.io", request.url().host());
265-
Assertions.assertEquals(6, request.url().pathSegments().size());
225+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(6, request.url().pathSegments().size());
266226
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
267227
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
268228
Assertions.assertNull(request.body());
269-
Assertions.assertNull(request.url().encodedQuery());
270-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share/" + ORG_ID + "/resend_invitation", request.url().toString());
271-
}
229+
Assertions.assertNull(request.url().encodedQuery()); }
272230

273231

274232
@Order(10)
@@ -287,15 +245,11 @@ void testTransferOwnership() {
287245
Request request = ORG.transferOwnership(body).request();
288246
Assertions.assertEquals(2, request.headers().names().size());
289247
Assertions.assertEquals("POST", request.method());
290-
Assertions.assertTrue(request.url().isHttps());
291-
Assertions.assertEquals("api.contentstack.io", request.url().host());
292-
Assertions.assertEquals(4, request.url().pathSegments().size());
248+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
293249
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
294250
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
295251
Assertions.assertNotNull(request.body());
296-
Assertions.assertNull(request.url().encodedQuery());
297-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/transfer-ownership", request.url().toString());
298-
}
252+
Assertions.assertNull(request.url().encodedQuery()); }
299253

300254
@Order(11)
301255
@Test
@@ -308,15 +262,11 @@ void testStacks() {
308262

309263
Assertions.assertEquals(2, request.headers().names().size());
310264
Assertions.assertEquals("GET", request.method());
311-
Assertions.assertTrue(request.url().isHttps());
312-
Assertions.assertEquals("api.contentstack.io", request.url().host());
313-
Assertions.assertEquals(4, request.url().pathSegments().size());
265+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
314266
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
315267
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
316268
Assertions.assertNull(request.body());
317-
Assertions.assertNotNull(request.url().encodedQuery());
318-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/stacks?include_plan=true", request.url().toString());
319-
}
269+
Assertions.assertNotNull(request.url().encodedQuery()); }
320270

321271
@Test
322272
@Order(12)
@@ -329,15 +279,11 @@ void testLogDetails() {
329279

330280
Assertions.assertEquals(2, request.headers().names().size());
331281
Assertions.assertEquals("GET", request.method());
332-
Assertions.assertTrue(request.url().isHttps());
333-
Assertions.assertEquals("api.contentstack.io", request.url().host());
334-
Assertions.assertEquals(4, request.url().pathSegments().size());
282+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
335283
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
336284
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
337285
Assertions.assertNull(request.body());
338-
Assertions.assertNull(request.url().encodedQuery());
339-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/logs", request.url().toString());
340-
}
286+
Assertions.assertNull(request.url().encodedQuery()); }
341287

342288
@Order(13)
343289
@Test
@@ -350,16 +296,11 @@ void testLogsItem() {
350296
Request request = ORG.logItem("fake@loguid").request();
351297
Assertions.assertEquals(2, request.headers().names().size());
352298
Assertions.assertEquals("GET", request.method());
353-
Assertions.assertTrue(request.url().isHttps());
354-
Assertions.assertEquals("api.contentstack.io", request.url().host());
355-
Assertions.assertEquals(5, request.url().pathSegments().size());
299+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(5, request.url().pathSegments().size());
356300
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
357301
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
358302
Assertions.assertNull(request.body());
359-
Assertions.assertNull(request.url().encodedQuery());
360-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/logs/fake@loguid", request.url().toString());
361-
362-
}
303+
Assertions.assertNull(request.url().encodedQuery()); }
363304

364305
@Order(14)
365306
@Test
@@ -373,15 +314,11 @@ void testAllInvitation() {
373314
Request request = ORG.allInvitations().request();
374315
Assertions.assertEquals(2, request.headers().names().size());
375316
Assertions.assertEquals("GET", request.method());
376-
Assertions.assertTrue(request.url().isHttps());
377-
Assertions.assertEquals("api.contentstack.io", request.url().host());
378-
Assertions.assertEquals(4, request.url().pathSegments().size());
317+
Assertions.assertTrue(request.url().isHttps()); Assertions.assertEquals(4, request.url().pathSegments().size());
379318
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
380319
Assertions.assertEquals("organizations", request.url().pathSegments().get(1));
381320
Assertions.assertNull(request.body());
382-
Assertions.assertNotNull(request.url().encodedQuery());
383-
Assertions.assertEquals("https://api.contentstack.io/v3/organizations/" + ORG_ID + "/share?include_plan=true", request.url().toString());
384-
}
321+
Assertions.assertNotNull(request.url().encodedQuery()); }
385322

386323
@Order(15)
387324
@Test

0 commit comments

Comments
 (0)