From 31157b6c5d4d6b5a6c7c008e02c3d4860bd6bfad Mon Sep 17 00:00:00 2001 From: Varun Rathore Date: Wed, 13 May 2026 12:09:35 +0530 Subject: [PATCH 1/3] fix issue in the new RC unit tests --- .../remoteconfig/ServerTemplateImpl.java | 2 +- .../remoteconfig/ServerTemplateImplTest.java | 26 +++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java b/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java index 742c19803..47d185bff 100644 --- a/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java +++ b/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java @@ -75,7 +75,7 @@ private ServerTemplateImpl(Builder builder) { try { this.cache.set(ServerTemplateData.fromJSON(initialTemplate)); } catch (FirebaseRemoteConfigException e) { - e.printStackTrace(); + throw new IllegalArgumentException("Unable to parse JSON string.", e); } } diff --git a/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java b/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java index bafe84331..d876a3b84 100644 --- a/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java +++ b/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import com.google.api.core.ApiFuture; import com.google.firebase.FirebaseApp; @@ -188,21 +189,18 @@ public void testEvaluateWithoutDefaultValueReturnsEmptyString() public void testEvaluateWithInvalidCacheValueThrowsException() throws FirebaseRemoteConfigException { KeysAndValues defaultConfig = new KeysAndValues.Builder().build(); - KeysAndValues context = new KeysAndValues.Builder().build(); String invalidJsonString = "abc"; - ServerTemplate template = - new ServerTemplateImpl.Builder(null) - .defaultConfig(defaultConfig) - .cachedTemplate(invalidJsonString) - .build(); - - FirebaseRemoteConfigException error = - assertThrows(FirebaseRemoteConfigException.class, () -> template.evaluate(context)); - - assertEquals( - "No Remote Config Server template in cache. Call load() before " + "calling evaluate().", - error.getMessage()); - } + IllegalArgumentException error = assertThrows( + IllegalArgumentException.class, + () -> new ServerTemplateImpl.Builder(null) + .defaultConfig(defaultConfig) + .cachedTemplate(invalidJsonString) + .build()); + + assertEquals("Unable to parse JSON string.", error.getMessage()); + // Verify the cause is the original FirebaseRemoteConfigException + assertTrue(error.getCause() instanceof FirebaseRemoteConfigException); + } @Test public void testEvaluateWithInAppDefaultReturnsEmptyString() throws Exception { From b4153a1f4aa50dbc0bb5f9abd4beadc0dac8e186 Mon Sep 17 00:00:00 2001 From: Varun Rathore Date: Wed, 13 May 2026 12:32:21 +0530 Subject: [PATCH 2/3] fix indentation --- .../firebase/remoteconfig/ServerTemplateImpl.java | 2 +- .../firebase/remoteconfig/ServerTemplateImplTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java b/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java index 47d185bff..633730bf3 100644 --- a/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java +++ b/src/main/java/com/google/firebase/remoteconfig/ServerTemplateImpl.java @@ -75,7 +75,7 @@ private ServerTemplateImpl(Builder builder) { try { this.cache.set(ServerTemplateData.fromJSON(initialTemplate)); } catch (FirebaseRemoteConfigException e) { - throw new IllegalArgumentException("Unable to parse JSON string.", e); + throw new IllegalArgumentException("Unable to parse JSON string.", e); } } diff --git a/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java b/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java index d876a3b84..c9ca4c2af 100644 --- a/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java +++ b/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java @@ -191,15 +191,15 @@ public void testEvaluateWithInvalidCacheValueThrowsException() KeysAndValues defaultConfig = new KeysAndValues.Builder().build(); String invalidJsonString = "abc"; IllegalArgumentException error = assertThrows( - IllegalArgumentException.class, - () -> new ServerTemplateImpl.Builder(null) + IllegalArgumentException.class, + () -> new ServerTemplateImpl.Builder(null) .defaultConfig(defaultConfig) .cachedTemplate(invalidJsonString) .build()); - assertEquals("Unable to parse JSON string.", error.getMessage()); - // Verify the cause is the original FirebaseRemoteConfigException - assertTrue(error.getCause() instanceof FirebaseRemoteConfigException); + assertEquals("Unable to parse JSON string.", error.getMessage()); + // Verify the cause is the original FirebaseRemoteConfigException + assertTrue(error.getCause() instanceof FirebaseRemoteConfigException); } @Test From 92c8afd6c25b0b24beb46536249c3d61531651a5 Mon Sep 17 00:00:00 2001 From: Varun Rathore Date: Wed, 13 May 2026 12:34:03 +0530 Subject: [PATCH 3/3] fix indentation --- .../google/firebase/remoteconfig/ServerTemplateImplTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java b/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java index c9ca4c2af..d7b761141 100644 --- a/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java +++ b/src/test/java/com/google/firebase/remoteconfig/ServerTemplateImplTest.java @@ -200,7 +200,7 @@ public void testEvaluateWithInvalidCacheValueThrowsException() assertEquals("Unable to parse JSON string.", error.getMessage()); // Verify the cause is the original FirebaseRemoteConfigException assertTrue(error.getCause() instanceof FirebaseRemoteConfigException); - } + } @Test public void testEvaluateWithInAppDefaultReturnsEmptyString() throws Exception {