From dedb1b9a98afb06fea1b811f8ffe3b84f2f7da0d Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Fri, 6 Jun 2025 17:11:51 +0530
Subject: [PATCH] chore: update CHANGELOG for version 4.0.1 and modify
 build.gradle to reflect new version; enhance GlobalFieldTestCase with
 improved logging and callback handling

---
 CHANGELOG.md                                  | 16 ++++++++++
 contentstack/build.gradle                     |  2 +-
 .../contentstack/sdk/GlobalFieldTestCase.java | 31 ++++++++++++++++---
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d2e1c1..3b3b585b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## Version 4.0.1
+
+### Date: 06-June-2024
+
+- Integration tests added
+- Global fields support added
+
+---
+## Version 4.0.0
+
+### Date: 12-Sept-2024
+
+- Added support for the upcoming Feature
+
+---
+
 ## Version 3.16.1
 
 ### Date: 21-August-2024
diff --git a/contentstack/build.gradle b/contentstack/build.gradle
index 5568c0a6..0d23213f 100755
--- a/contentstack/build.gradle
+++ b/contentstack/build.gradle
@@ -10,7 +10,7 @@ android.buildFeatures.buildConfig true
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.DEFAULT)
     signAllPublications()
-    coordinates("com.contentstack.sdk", "android", "4.0.0")
+    coordinates("com.contentstack.sdk", "android", "4.0.1")
 
     pom {
         name = "contentstack-android"
diff --git a/contentstack/src/androidTest/java/com/contentstack/sdk/GlobalFieldTestCase.java b/contentstack/src/androidTest/java/com/contentstack/sdk/GlobalFieldTestCase.java
index 3bdae342..50a7225b 100644
--- a/contentstack/src/androidTest/java/com/contentstack/sdk/GlobalFieldTestCase.java
+++ b/contentstack/src/androidTest/java/com/contentstack/sdk/GlobalFieldTestCase.java
@@ -38,19 +38,40 @@ public void setUp() {
 
     @Test
     public void test_fetchGlobalField() throws Exception {
-      GlobalField globalField = stack.globalField("specific_gf_uid");
-        globalField.findAll(new GlobalFieldsResultCallback() {
+//      GlobalField globalField = stack.globalField("specific_gf_uid").includeBranch();
+//        globalField.fetch(new GlobalFieldsResultCallback() {
+//            @Override
+//            public void onCompletion(GlobalFieldsModel globalFieldsModel, Error error) {
+//                if (error == null) {
+//                    JSONArray result = globalFieldsModel.getResultArray();
+//                    System.out.println("✅ Global Fields Response: " + result);
+////                    Assertions.assertEquals("main", );
+//                    Log.d(TAG, "✅ Global Fields Response: " + result);
+//                    Assertions.assertNotNull(result);
+//                } else {
+//                    System.out.println("❌ Error: " + error.getErrorMessage());
+//                }
+//                latch.countDown(); // Signal that response arrived
+//            }
+//        });
+        CountDownLatch latch = new CountDownLatch(1); // <- define inside test
+
+        GlobalField globalField = stack.globalField("specific_gf_uid").includeBranch();
+        globalField.fetch(new GlobalFieldsResultCallback() {
             @Override
             public void onCompletion(GlobalFieldsModel globalFieldsModel, Error error) {
                 if (error == null) {
                     JSONArray result = globalFieldsModel.getResultArray();
-                    System.out.println("✅ Global Fields Response: " + result);
+                    Log.d(TAG, "✅ Global Fields Response: " + result);
+                    Assertions.assertNotNull(result);
                 } else {
-                    System.out.println("❌ Error: " + error.getErrorMessage());
+                    Log.e(TAG, "❌ Error: " + error.getErrorMessage());
                 }
-                latch.countDown(); // Signal that response arrived
+                latch.countDown();
             }
         });
+
+        latch.await(10, TimeUnit.SECONDS); // Wait for callback
     }