[CS-36689] Unit Tests Added

Author: ishaileshmishra

.github/workflows/publish.yml

@@ -1,7 +1,13 @@
 name: Publish package to the Maven Central Repository and GitHub Packages
+
 on:
-  release:
-    types: [created]
+  push:
+    branches:
+      - feat/CS-36689-compare-merge-branch
+
+#on:
+#  release:
+#    types: [ created ]
 jobs:
   publish:
     runs-on: ubuntu-latest

README.md

@@ -109,7 +109,7 @@ To create an entry in a specific content type of a stack, use the following line
         JSONObject body=....
         Response<ResponseBody> response=entry.create(body).execute();
         if(response.isSuccessful()){
-             System.out.println(response.body());
+        System.out.println(response.body());
         }
 ```
 
@@ -123,9 +123,9 @@ The following lines of code can be used to upload assets to your stack:
         Asset asset=stack.asset();
         Response<ResponseBody> response=asset.uploadAsset("filePath","description").execute();
         if(response.isSuccessful()){
-            System.out.println(response.body());
+        System.out.println(response.body());
         }else{
-            System.out.println(response.errorBody());
+        System.out.println(response.errorBody());
         }
 ```
 

SECURITY.md

@@ -1,18 +1,22 @@
 ## Security
 
-Contentstack takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations.
+Contentstack takes the security of our software products and services seriously, which includes all source code
+repositories managed through our GitHub organizations.
 
-If you believe you have found a security vulnerability in any Contentstack-owned repository, please report it to us as described below.
+If you believe you have found a security vulnerability in any Contentstack-owned repository, please report it to us as
+described below.
 
 ## Reporting Security Issues
 
 **Please do not report security vulnerabilities through public GitHub issues.**
 
 Send email to [security@contentstack.com](mailto:security@contentstack.com).
 
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we
+received your original message.
 
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+Please include the requested information listed below (as much as you can provide) to help us better understand the
+nature and scope of the possible issue:
 
 - Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
 - Full paths of source file(s) related to the manifestation of the issue

changelog.md

@@ -9,6 +9,8 @@
 - Code coverage improvements
 - Code quality improvements
 - Fixed Timeout Issue
+- Few breaking changes
+- Basic code improvements
 
 ## v0.1.0
 

src/main/java/com/contentstack/cms/stack/Merge.java

@@ -83,7 +83,7 @@ protected Merge(Retrofit instance, String uid) {
 
     /**
      * The Merge branches request merges the specified two branches as per the merge strategy selected.
-     *
+     * <br>
      * <b>Additional Resource:</b> To learn how to select and use the merge strategies, refer to our documentation on
      * Merging Branches.
      * <br>
@@ -128,8 +128,8 @@ public Call<ResponseBody> branch(@NotNull String compareBranch, JSONObject reque
      *
      * @return the call
      * @see <a href=
-     * "https://stag-www.contentstack.com/docs/developers/apis/content-management-api/#get-all-merge-jobs"></a>Get all Merge
-     * Jobs
+     * "https://stag-www.contentstack.com/docs/developers/apis/content-management-api/#get-all-merge-jobs"></a>Get all
+     * Merge Jobs
      */
     public Call<ResponseBody> find() {
         return this.service.find(this.headers, this.params);

src/test/java/com/contentstack/cms/stack/ContentTypeAPITest.java

@@ -7,8 +7,6 @@
 import org.json.simple.JSONObject;
 import org.junit.jupiter.api.*;
 
-import java.io.IOException;
-
 @Tag("unit")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ContentTypeAPITest {
@@ -18,6 +16,7 @@ class ContentTypeAPITest {
     protected static String MANAGEMENT_TOKEN = TestClient.MANAGEMENT_TOKEN;
     protected static String contentTypeUid = "contentType";
     protected static Stack stack;
+    private int _COUNT = 3;
 
 
     @BeforeAll
@@ -28,10 +27,10 @@ public void setUp() {
 
     @Order(1)
     @Test
-    void setupBeforeStart() throws IOException {
+    void setupBeforeStart() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.find().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -48,7 +47,7 @@ void testCreate() {
         JSONObject requestBody = Utils.readJson("mockcontenttype/create.json");
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.create(requestBody).request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -68,7 +67,7 @@ void testFetchAPI() {
         contentType.addParam("include_global_field_schema", true);
 
         Request request = contentType.find().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -86,7 +85,7 @@ void testFetchAPI() {
     void testSingleApi() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.fetch().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -103,7 +102,7 @@ void testUpdate() {
         contentType = stack.contentType(contentTypeUid);
         JSONObject requestBody = Utils.readJson("mockcontenttype/update.json");
         Request request = contentType.update(requestBody).request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -120,7 +119,7 @@ void testFieldVisibilityRule() {
         contentType = stack.contentType(contentTypeUid);
         JSONObject requestBody = Utils.readJson("mockcontenttype/visibility.json");
         Request request = contentType.fieldVisibilityRule(requestBody).request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -137,7 +136,7 @@ void testFieldVisibilityRule() {
     void testReference() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.reference(false).request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -153,7 +152,7 @@ void testReference() {
     void testReferenceIncludingGlobalField() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.referenceIncludeGlobalField().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -170,7 +169,7 @@ void testReferenceIncludingGlobalField() {
     void testExport() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.export().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -186,7 +185,7 @@ void testExport() {
     void testExportByVersion() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.export(1).request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -203,7 +202,7 @@ void testExportByVersion() {
     void testImport() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.imports().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -219,7 +218,7 @@ void testImport() {
     void testImportOverwrite() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.importOverwrite().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -236,7 +235,7 @@ void testImportOverwrite() {
     void testDeleteContentType() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.delete().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());
@@ -252,7 +251,7 @@ void testDeleteContentType() {
     void testDeleteForcefully() {
         contentType = stack.contentType(contentTypeUid);
         Request request = contentType.delete().request();
-        Assertions.assertEquals(2, request.headers().names().size());
+        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());