Skip to content

Commit 1fd3b4b

Browse files
author
reeshika-h
committed
added: changes in setup of testcases
1 parent ffb42a0 commit 1fd3b4b

File tree

4 files changed

+42
-31
lines changed

4 files changed

+42
-31
lines changed

‎src/main/java/com/contentstack/cms/stack/TokenService.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,53 @@
1010
public interface TokenService {
1111

1212
// Delivery Tokens
13-
@GET("delivery_tokens")
13+
@GET("stacks/delivery_tokens")
1414
Call<ResponseBody> getDeliveryToken(
1515
@HeaderMap Map<String, Object> headers);
1616

17-
@GET("delivery_tokens/{token_uid}")
17+
@GET("stacks/delivery_tokens/{token_uid}")
1818
Call<ResponseBody> getDeliveryToken(
1919
@HeaderMap Map<String, Object> headers,
2020
@Path("token_uid") String tokenUid);
2121

22-
@POST("delivery_tokens")
22+
@POST("stacks/delivery_tokens")
2323
Call<ResponseBody> createDeliveryToken(
2424
@HeaderMap Map<String, Object> headers,
2525
@Body JSONObject body);
2626

27-
@PUT("delivery_tokens/{token_uid}")
27+
@PUT("stacks/delivery_tokens/{token_uid}")
2828
Call<ResponseBody> updateDeliveryToken(
2929
@HeaderMap Map<String, Object> headers,
3030
@Path("token_uid") String tokenUid,
3131
@Body JSONObject body);
3232

33-
@DELETE("delivery_tokens/{token_uid}")
33+
@DELETE("stacks/delivery_tokens/{token_uid}")
3434
Call<ResponseBody> deleteDeliveryToken(
3535
@HeaderMap Map<String, Object> headers,
3636
@Path("token_uid") String tokenUid,
3737
@Query("force") Boolean force);
3838

3939
// Management Tokens
40-
@GET("management_tokens")
40+
@GET("stacks/management_tokens")
4141
Call<ResponseBody> fetchManagementToken(
4242
@HeaderMap Map<String, Object> headers, @QueryMap Map<String, Object> params);
4343

44-
@GET("management_tokens/{token_uid}")
44+
@GET("stacks/management_tokens/{token_uid}")
4545
Call<ResponseBody> getSingleManagementToken(
4646
@HeaderMap Map<String, Object> headers,
4747
@Path("token_uid") String tokenUid);
4848

49-
@POST("management_tokens")
49+
@POST("stacks/management_tokens")
5050
Call<ResponseBody> createManagementToken(
5151
@HeaderMap Map<String, Object> headers,
5252
@Body JSONObject body);
5353

54-
@PUT("management_tokens/{token_uid}")
54+
@PUT("stacks/management_tokens/{token_uid}")
5555
Call<ResponseBody> updateManagementToken(
5656
@HeaderMap Map<String, Object> headers,
5757
@Path("token_uid") String tokenUid, @Body JSONObject body);
5858

59-
@DELETE("management_tokens/{token_uid}")
59+
@DELETE("stacks/management_tokens/{token_uid}")
6060
Call<ResponseBody> deleteManagementToken(
6161
@HeaderMap Map<String, Object> headers,
6262
@Path("token_uid") String tokenUid);

‎src/test/java/com/contentstack/cms/stack/EnvironmentAPITest.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.contentstack.cms.Contentstack;
44
import com.contentstack.cms.TestClient;
55
import com.contentstack.cms.Utils;
6+
import com.contentstack.cms.core.Util;
7+
68
import okhttp3.ResponseBody;
79
import org.json.simple.JSONObject;
810
import org.junit.jupiter.api.*;
@@ -17,17 +19,21 @@ public class EnvironmentAPITest {
1719
protected static String API_KEY = TestClient.API_KEY;
1820
protected static String MANAGEMENT_TOKEN = TestClient.AUTHTOKEN;
1921
static Environment environment;
22+
protected static Stack stackInstance;
23+
2024

2125
@BeforeAll
2226
public static void setupEnv() {
23-
Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
24-
Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
27+
// Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
28+
// Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
29+
stackInstance = TestClient.getStack().addHeader(Util.API_KEY, API_KEY)
30+
.addHeader("api_key", API_KEY);
2531
environment = stackInstance.environment("production");
2632
}
2733

2834
@Test
2935
@Order(1)
30-
void fetchLocales() {
36+
void fetchEnvironments() {
3137
environment.addParam("include_count", false);
3238
environment.addParam("asc", "created_at");
3339
environment.addParam("desc", "updated_at");
@@ -46,7 +52,7 @@ void fetchLocales() {
4652

4753
@Test
4854
@Order(2)
49-
void addLocale() {
55+
void fetchEnvironment() {
5056
try {
5157
Response<ResponseBody> response = environment.fetch().execute();
5258
if (response.isSuccessful()) {
@@ -61,7 +67,7 @@ void addLocale() {
6167

6268
@Test
6369
@Order(3)
64-
void getLocale() {
70+
void createEnvironment() {
6571
// add_env.json
6672
JSONObject requestBody = Utils.readJson("environment/add_env.json");
6773
try {
@@ -78,7 +84,7 @@ void getLocale() {
7884

7985
@Test
8086
@Order(4)
81-
void updateLocale() {
87+
void updateEnvironment() {
8288
JSONObject requestBody = Utils.readJson("environment/add_env.json");
8389
try {
8490
Response<ResponseBody> response = environment.update(requestBody).execute();
@@ -94,7 +100,7 @@ void updateLocale() {
94100

95101
@Test
96102
@Order(5)
97-
void deleteLocale() {
103+
void deleteEnvironment() {
98104
try {
99105
Response<ResponseBody> response = environment.delete().execute();
100106
if (response.isSuccessful()) {

‎src/test/java/com/contentstack/cms/stack/LocaleAPITest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.contentstack.cms.Contentstack;
44
import com.contentstack.cms.TestClient;
55
import com.contentstack.cms.Utils;
6+
import com.contentstack.cms.core.Util;
7+
68
import okhttp3.ResponseBody;
79
import org.json.simple.JSONObject;
810
import org.junit.jupiter.api.Assertions;
@@ -20,11 +22,14 @@ public class LocaleAPITest {
2022
protected static String API_KEY = TestClient.API_KEY;
2123
protected static String MANAGEMENT_TOKEN = TestClient.MANAGEMENT_TOKEN;
2224
static Locale locale;
25+
protected static Stack stackInstance;
2326

2427
@BeforeAll
2528
public static void setupEnv() {
26-
Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
27-
Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
29+
// Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
30+
// Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
31+
stackInstance = TestClient.getStack().addHeader(Util.API_KEY, API_KEY)
32+
.addHeader("api_key", API_KEY);
2833
locale = stackInstance.locale(MANAGEMENT_TOKEN);
2934
}
3035

‎src/test/java/com/contentstack/cms/stack/TokenUnitTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void allDeliveryTokens() {
100100
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
101101
Assertions.assertNull(request.url().encodedQuery());
102102
Assertions.assertEquals(
103-
"https://api.contentstack.io/v3/delivery_tokens",
103+
"https://api.contentstack.io/v3/stacks/delivery_tokens",
104104
request.url().toString());
105105
}
106106

@@ -116,7 +116,7 @@ void singleDeliveryToken() {
116116
Assertions.assertEquals("v3", request.url().pathSegments().get(0));
117117
Assertions.assertNull(request.url().encodedQuery());
118118
Assertions.assertEquals(
119-
"https://api.contentstack.io/v3/delivery_tokens/" + _uid,
119+
"https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid,
120120
request.url().toString());
121121
}
122122

@@ -132,7 +132,7 @@ void createDeliveryToken() {
132132
Assertions.assertNotNull(request.body());
133133
Assertions.assertNull(request.url().encodedQuery());
134134
Assertions.assertEquals(
135-
"https://api.contentstack.io/v3/delivery_tokens",
135+
"https://api.contentstack.io/v3/stacks/delivery_tokens",
136136
request.url().toString());
137137
}
138138

@@ -146,7 +146,7 @@ void updateDeliveryToken() {
146146
Assertions.assertEquals(3, request.url().pathSegments().size());
147147
Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1));
148148
Assertions.assertNull(request.url().encodedQuery());
149-
Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens/" + _uid, request.url().toString());
149+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid, request.url().toString());
150150
}
151151

152152
@Test
@@ -159,7 +159,7 @@ void deleteDeliveryToken() {
159159
Assertions.assertEquals(3, request.url().pathSegments().size());
160160
Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1));
161161
Assertions.assertEquals("force=false", request.url().encodedQuery());
162-
Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens/" + _uid + "?force=false",
162+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid + "?force=false",
163163
request.url().toString());
164164
}
165165

@@ -173,7 +173,7 @@ void deleteDeliveryTokenForcefully() {
173173
Assertions.assertEquals(3, request.url().pathSegments().size());
174174
Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1));
175175
Assertions.assertEquals("force=true", request.url().encodedQuery());
176-
Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens/" + _uid + "?force=true",
176+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid + "?force=true",
177177
request.url().toString());
178178
}
179179

@@ -188,7 +188,7 @@ void allManagementToken() {
188188
Assertions.assertEquals(2, request.url().pathSegments().size());
189189
Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
190190
Assertions.assertNull(request.url().encodedQuery());
191-
Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens",
191+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens",
192192
request.url().toString());
193193
}
194194

@@ -203,7 +203,7 @@ void singleManagementToken() {
203203
Assertions.assertEquals(3, request.url().pathSegments().size());
204204
Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
205205
Assertions.assertNull(request.url().encodedQuery());
206-
Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens/" + _uid, request.url().toString());
206+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString());
207207
}
208208

209209
@Test
@@ -217,7 +217,7 @@ void createManagementToken() {
217217
Assertions.assertEquals(2, request.url().pathSegments().size());
218218
Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
219219
Assertions.assertNull(request.url().encodedQuery());
220-
Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens", request.url().toString());
220+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens", request.url().toString());
221221
}
222222

223223
@Test
@@ -231,7 +231,7 @@ void updateManagementToken() {
231231
Assertions.assertEquals(3, request.url().pathSegments().size());
232232
Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
233233
Assertions.assertNull(request.url().encodedQuery());
234-
Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens/" + _uid, request.url().toString());
234+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString());
235235
}
236236

237237
@Test
@@ -245,7 +245,7 @@ void deleteManagementToken() {
245245
Assertions.assertEquals(3, request.url().pathSegments().size());
246246
Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
247247
Assertions.assertNull(request.url().encodedQuery());
248-
Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens/" + _uid, request.url().toString());
248+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString());
249249
}
250250

251251
@Test
@@ -257,7 +257,7 @@ void testHeaderAndParams() {
257257
deliveryToken.addParam("key", "Value");
258258
deliveryToken.removeParam("key");
259259
Request request = tokens.deliveryTokens().find().request();
260-
Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens",
260+
Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens",
261261
request.url().toString());
262262
}
263263
}

0 commit comments

Comments
 (0)