From 51e723f6fdb9f758b0b5841cb4a686c03d3459a3 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Tue, 15 Mar 2022 11:22:26 +0100
Subject: [PATCH 01/30] fix: remove Magic number in CollectionTest

---
 .../com/google/gson/functional/CollectionTest.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 8d831a63e9..b1009c13ea 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -128,14 +128,16 @@ public void testQueueDeserialization() {
   }
 
   public void testPriorityQueue() throws Exception {
+    int[] value = {10, 20, 22};
+    String stringToSerialize = value.toString();
     Type type = new TypeToken<PriorityQueue<Integer>>(){}.getType();
-    PriorityQueue<Integer> queue = gson.fromJson("[10, 20, 22]", type);
-    assertEquals(3, queue.size());
+    PriorityQueue<Integer> queue = gson.fromJson(stringToSerialize, type);
+    assertEquals(value.length, queue.size());
     String json = gson.toJson(queue);
-    assertEquals(10, queue.remove().intValue());
-    assertEquals(20, queue.remove().intValue());
-    assertEquals(22, queue.remove().intValue());
-    assertEquals("[10,20,22]", json);
+    for (int i = 0; i< value.length; i++){
+      assertEquals(value[i], queue.remove().intValue());
+    }
+    assertEquals(stringToSerialize, json);
   }
 
   public void testVector() {

From 996eca1df017ce4123af123a17985c8fcd7c9dc8 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Tue, 15 Mar 2022 11:36:42 +0100
Subject: [PATCH 02/30] fix: remove Magic number in CollectionTest

---
 .../gson/functional/CollectionTest.java       | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index b1009c13ea..6a883eff9d 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -134,32 +134,36 @@ public void testPriorityQueue() throws Exception {
     PriorityQueue<Integer> queue = gson.fromJson(stringToSerialize, type);
     assertEquals(value.length, queue.size());
     String json = gson.toJson(queue);
-    for (int i = 0; i< value.length; i++){
+    for (int i = 0; i < value.length; i++){
       assertEquals(value[i], queue.remove().intValue());
     }
     assertEquals(stringToSerialize, json);
   }
 
   public void testVector() {
+    int[] value = {10, 20, 31};
+    String stringToSerialize = value.toString();
     Type type = new TypeToken<Vector<Integer>>(){}.getType();
-    Vector<Integer> target = gson.fromJson("[10, 20, 31]", type);
-    assertEquals(3, target.size());
-    assertEquals(10, target.get(0).intValue());
-    assertEquals(20, target.get(1).intValue());
-    assertEquals(31, target.get(2).intValue());
+    Vector<Integer> target = gson.fromJson(stringToSerialize, type);
+    assertEquals(value.length, target.size());
+    for (int i = 0; i < value.length; i++){
+      assertEquals(value[i], target.get(i).intValue());
+    }
     String json = gson.toJson(target);
-    assertEquals("[10,20,31]", json);
+    assertEquals(stringToSerialize, json);
   }
 
   public void testStack() {
+    int[] value = {11, 13, 17};
+    String stringToSerialize = value.toString();
     Type type = new TypeToken<Stack<Integer>>(){}.getType();
-    Stack<Integer> target = gson.fromJson("[11, 13, 17]", type);
-    assertEquals(3, target.size());
+    Stack<Integer> target = gson.fromJson(stringToSerialize, type);
+    assertEquals(value.length, target.size());
     String json = gson.toJson(target);
-    assertEquals(17, target.pop().intValue());
-    assertEquals(13, target.pop().intValue());
-    assertEquals(11, target.pop().intValue());
-    assertEquals("[11,13,17]", json);
+    for (int i = 3; i > 0; i--){
+      assertEquals(value[i], target.pop().intValue());
+    }
+    assertEquals(stringToSerialize, json);
   }
 
   public void testNullsInListSerialization() {

From abf30d5439395eae90c2778830b511bfb6bdf9ac Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Tue, 22 Mar 2022 10:51:20 +0100
Subject: [PATCH 03/30] fix: remove Magic number in CollectionTest

---
 .../google/gson/functional/CollectionTest.java  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 6a883eff9d..553a24bb28 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -129,41 +129,38 @@ public void testQueueDeserialization() {
 
   public void testPriorityQueue() throws Exception {
     int[] value = {10, 20, 22};
-    String stringToSerialize = value.toString();
     Type type = new TypeToken<PriorityQueue<Integer>>(){}.getType();
-    PriorityQueue<Integer> queue = gson.fromJson(stringToSerialize, type);
+    PriorityQueue<Integer> queue = gson.fromJson("[10, 20, 22]", type);
     assertEquals(value.length, queue.size());
     String json = gson.toJson(queue);
     for (int i = 0; i < value.length; i++){
       assertEquals(value[i], queue.remove().intValue());
     }
-    assertEquals(stringToSerialize, json);
+    assertEquals("[10,20,22]", json);
   }
 
   public void testVector() {
     int[] value = {10, 20, 31};
-    String stringToSerialize = value.toString();
     Type type = new TypeToken<Vector<Integer>>(){}.getType();
-    Vector<Integer> target = gson.fromJson(stringToSerialize, type);
+    Vector<Integer> target = gson.fromJson("[10, 20, 31]", type);
     assertEquals(value.length, target.size());
     for (int i = 0; i < value.length; i++){
       assertEquals(value[i], target.get(i).intValue());
     }
     String json = gson.toJson(target);
-    assertEquals(stringToSerialize, json);
+    assertEquals("[10,20,31]", json);
   }
 
   public void testStack() {
     int[] value = {11, 13, 17};
-    String stringToSerialize = value.toString();
     Type type = new TypeToken<Stack<Integer>>(){}.getType();
-    Stack<Integer> target = gson.fromJson(stringToSerialize, type);
+    Stack<Integer> target = gson.fromJson("[11, 13, 17]", type);
     assertEquals(value.length, target.size());
     String json = gson.toJson(target);
-    for (int i = 3; i > 0; i--){
+    for (int i = 2; i > 0; i--){
       assertEquals(value[i], target.pop().intValue());
     }
-    assertEquals(stringToSerialize, json);
+    assertEquals("[11,13,17]", json);
   }
 
   public void testNullsInListSerialization() {

From f776d6cc6825765846f4d025f1cc462b936e8555 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 18:02:09 +0200
Subject: [PATCH 04/30] JUnit assertion to Truth assertion

in CollectionTest.testCollectionOfStringsDeserialization
and
CollectionTest.testRawCollectionDeserializationNotAlllowed
---
 gson/pom.xml                                          |  8 ++++++++
 .../com/google/gson/functional/CollectionTest.java    | 11 +++++++----
 pom.xml                                               |  7 +++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/gson/pom.xml b/gson/pom.xml
index a6eb1f80eb..0ac3c75dd9 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -23,6 +23,10 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -41,6 +45,10 @@
             </configuration>
           </execution>
         </executions>
+        <configuration>
+          <source>9</source>
+          <target>9</target>
+        </configuration>
       </plugin>
       <!-- Note: Javadoc plugin has to be run in combination with >= `package` 
         phase, e.g. `mvn package javadoc:javadoc`, otherwise it fails with
diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 553a24bb28..a52f863161 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -41,7 +41,9 @@
 import com.google.gson.reflect.TypeToken;
 
 import junit.framework.TestCase;
+
 import static org.junit.Assert.assertArrayEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 /**
  * Functional tests for Json serialization and deserialization of collections.
@@ -157,7 +159,7 @@ public void testStack() {
     Stack<Integer> target = gson.fromJson("[11, 13, 17]", type);
     assertEquals(value.length, target.size());
     String json = gson.toJson(target);
-    for (int i = 2; i > 0; i--){
+    for (int i = (value.length - 1); i >= 0; i--){
       assertEquals(value[i], target.pop().intValue());
     }
     assertEquals("[11,13,17]", json);
@@ -235,8 +237,9 @@ public void testCollectionOfStringsDeserialization() {
     Type collectionType = new TypeToken<Collection<String>>() { }.getType();
     Collection<String> target = gson.fromJson(json, collectionType);
 
-    assertTrue(target.contains("Hello"));
-    assertTrue(target.contains("World"));
+    //assertTrue(target.contains("Hello"));
+    assertThat(target.contains("Hello")).isTrue();
+    assertThat(target.contains("World")).isTrue();
   }
 
   public void testRawCollectionOfIntegersSerialization() {
@@ -257,7 +260,7 @@ public void testRawCollectionDeserializationNotAlllowed() {
     String json = "[0,1,2,3,4,5,6,7,8,9]";
     Collection integers = gson.fromJson(json, Collection.class);
     // JsonReader converts numbers to double by default so we need a floating point comparison
-    assertEquals(Arrays.asList(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), integers);
+    assertThat(integers).containsAtLeast(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
 
     json = "[\"Hello\", \"World\"]";
     Collection strings = gson.fromJson(json, Collection.class);
diff --git a/pom.xml b/pom.xml
index eab2eafca8..d0e6f7c51b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,13 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>com.google.truth</groupId>
+        <artifactId>truth</artifactId>
+        <version>1.1.3</version>
+        <scope>test</scope>
+      </dependency>
+
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>

From feefe22561acaa1d6386d8446fac88ef2c9b8194 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 18:04:33 +0200
Subject: [PATCH 05/30] JUnit assertion to Truth assertion

in CollectionTest.testRawCollectionOfIntegersSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index a52f863161..e857d1cbc4 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -244,7 +244,7 @@ public void testCollectionOfStringsDeserialization() {
 
   public void testRawCollectionOfIntegersSerialization() {
     Collection<Integer> target = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9);
-    assertEquals("[1,2,3,4,5,6,7,8,9]", gson.toJson(target));
+    assertThat(gson.toJson(target)).contains("[1,2,3,4,5,6,7,8,9]");
   }
 
   @SuppressWarnings("rawtypes")

From 10ea6e8b8fd11dd78ccb7fa3fe44798d4dc05397 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 18:52:30 +0200
Subject: [PATCH 06/30] JUnit assertion to Truth assertion

in CollectionTest.testTopLevelCollectionOfIntegersSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index e857d1cbc4..6c226d0abf 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -64,7 +64,7 @@ public void testTopLevelCollectionOfIntegersSerialization() {
     Collection<Integer> target = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9);
     Type targetType = new TypeToken<Collection<Integer>>() {}.getType();
     String json = gson.toJson(target, targetType);
-    assertEquals("[1,2,3,4,5,6,7,8,9]", json);
+    assertThat("[1,2,3,4,5,6,7,8,9]").isEqualTo(json);
   }
 
   public void testTopLevelCollectionOfIntegersDeserialization() {

From 1c359de68014661530059b7cdbf92be97700d4df Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 18:53:52 +0200
Subject: [PATCH 07/30] JUnit assertion to Truth assertion

in CollectionTest.testTopLevelCollectionOfIntegersDeserialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 6c226d0abf..6141721d69 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -72,7 +72,7 @@ public void testTopLevelCollectionOfIntegersDeserialization() {
     Type collectionType = new TypeToken<Collection<Integer>>() { }.getType();
     Collection<Integer> target = gson.fromJson(json, collectionType);
     int[] expected = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    assertArrayEquals(expected, toIntArray(target));
+    assertThat(toIntArray(target)).isEqualTo(expected);
   }
 
   public void testTopLevelListOfIntegerCollectionsDeserialization() throws Exception {

From e8776a22f0522a4c848e7f4a1481ab6f421c08f5 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 18:55:13 +0200
Subject: [PATCH 08/30] JUnit assertion to Truth assertion

in CollectionTest.testTopLevelListOfIntegerCollectionsDeserialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 6141721d69..4c29013afd 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -88,7 +88,7 @@ public void testTopLevelListOfIntegerCollectionsDeserialization() throws Excepti
     }
 
     for (int i = 0; i < 3; i++) {
-      assertArrayEquals(expected[i], toIntArray(target.get(i)));
+      assertThat(toIntArray(target.get(i))).isEqualTo(expected[i]);
     }
   }
 

From 3c7feb849346b36eddbd839856ac3b952a172222 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 18:57:49 +0200
Subject: [PATCH 09/30] JUnit assertion to Truth assertion

in CollectionTest.testLinkedListSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 4c29013afd..6ab3db9209 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -98,8 +98,8 @@ public void testLinkedListSerialization() {
     list.add("a2");
     Type linkedListType = new TypeToken<LinkedList<String>>() {}.getType();
     String json = gson.toJson(list, linkedListType);
-    assertTrue(json.contains("a1"));
-    assertTrue(json.contains("a2"));
+    assertThat(json.contains("a1")).isTrue();
+    assertThat(json.contains("a2")).isTrue();
   }
 
   public void testLinkedListDeserialization() {

From 38b729db40643b7622de3460f24b31d78c27eec5 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:00:07 +0200
Subject: [PATCH 10/30] JUnit assertion to Truth assertion

in CollectionTest.testLinkedListDeserialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 6ab3db9209..aae2e5a7f3 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -106,8 +106,8 @@ public void testLinkedListDeserialization() {
     String json = "['a1','a2']";
     Type linkedListType = new TypeToken<LinkedList<String>>() {}.getType();
     List<String> list = gson.fromJson(json, linkedListType);
-    assertEquals("a1", list.get(0));
-    assertEquals("a2", list.get(1));
+    assertThat(list.get(0)).isEqualTo("a1");
+    assertThat(list.get(1)).isEqualTo("a2");
   }
 
   public void testQueueSerialization() {

From e9e9e67cec8d96f61f3632f251dcc69f3dade03f Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:02:00 +0200
Subject: [PATCH 11/30] JUnit assertion to Truth assertion

in CollectionTest.testQueueSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index aae2e5a7f3..e724572a17 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -116,8 +116,8 @@ public void testQueueSerialization() {
     queue.add("a2");
     Type queueType = new TypeToken<Queue<String>>() {}.getType();
     String json = gson.toJson(queue, queueType);
-    assertTrue(json.contains("a1"));
-    assertTrue(json.contains("a2"));
+    assertThat(json.contains("a1")).isTrue();
+    assertThat(json.contains("a2")).isTrue();
   }
 
   public void testQueueDeserialization() {

From f44327615b4d26b9c5383afe96b8e9323d67c881 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:04:07 +0200
Subject: [PATCH 12/30] JUnit assertion to Truth assertion

in CollectionTest.testQueueDeserialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index e724572a17..fc140a75b4 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -124,9 +124,9 @@ public void testQueueDeserialization() {
     String json = "['a1','a2']";
     Type queueType = new TypeToken<Queue<String>>() {}.getType();
     Queue<String> queue = gson.fromJson(json, queueType);
-    assertEquals("a1", queue.element());
+    assertThat(queue.element()).isEqualTo("a1");
     queue.remove();
-    assertEquals("a2", queue.element());
+    assertThat(queue.element()).isEqualTo("a2");
   }
 
   public void testPriorityQueue() throws Exception {

From 3cafb34ecb06395709aa0ce215ee20752e624689 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:06:28 +0200
Subject: [PATCH 13/30] JUnit assertion to Truth assertion

in CollectionTest.testPriorityQueue
---
 .../java/com/google/gson/functional/CollectionTest.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index fc140a75b4..7041126f5e 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -133,12 +133,12 @@ public void testPriorityQueue() throws Exception {
     int[] value = {10, 20, 22};
     Type type = new TypeToken<PriorityQueue<Integer>>(){}.getType();
     PriorityQueue<Integer> queue = gson.fromJson("[10, 20, 22]", type);
-    assertEquals(value.length, queue.size());
+    assertThat(queue.size()).isEqualTo(value.length);
     String json = gson.toJson(queue);
     for (int i = 0; i < value.length; i++){
-      assertEquals(value[i], queue.remove().intValue());
+      assertThat(queue.remove().intValue()).isEqualTo(value[i]);
     }
-    assertEquals("[10,20,22]", json);
+    assertThat(json).isEqualTo("[10,20,22]");
   }
 
   public void testVector() {

From 0c660b4fa84a4159789778bd5efda0b96b65e91e Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:08:57 +0200
Subject: [PATCH 14/30] JUnit assertion to Truth assertion

in CollectionTest.testVector
---
 .../test/java/com/google/gson/functional/CollectionTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 7041126f5e..3c2779d972 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -146,11 +146,12 @@ public void testVector() {
     Type type = new TypeToken<Vector<Integer>>(){}.getType();
     Vector<Integer> target = gson.fromJson("[10, 20, 31]", type);
     assertEquals(value.length, target.size());
+    assertThat(target.size()).isEqualTo(value.length);
     for (int i = 0; i < value.length; i++){
-      assertEquals(value[i], target.get(i).intValue());
+      assertThat(target.get(i).intValue()).isEqualTo(value[i]);
     }
     String json = gson.toJson(target);
-    assertEquals("[10,20,31]", json);
+    assertThat(json).isEqualTo("[10,20,31]");
   }
 
   public void testStack() {

From a3e6cd7fbbde1efb99c46f2ad9a80d82fbf42d30 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:13:45 +0200
Subject: [PATCH 15/30] JUnit assertion to Truth assertion

in CollectionTest.testStack
---
 .../java/com/google/gson/functional/CollectionTest.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 3c2779d972..e04d99a88d 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -145,7 +145,6 @@ public void testVector() {
     int[] value = {10, 20, 31};
     Type type = new TypeToken<Vector<Integer>>(){}.getType();
     Vector<Integer> target = gson.fromJson("[10, 20, 31]", type);
-    assertEquals(value.length, target.size());
     assertThat(target.size()).isEqualTo(value.length);
     for (int i = 0; i < value.length; i++){
       assertThat(target.get(i).intValue()).isEqualTo(value[i]);
@@ -158,12 +157,12 @@ public void testStack() {
     int[] value = {11, 13, 17};
     Type type = new TypeToken<Stack<Integer>>(){}.getType();
     Stack<Integer> target = gson.fromJson("[11, 13, 17]", type);
-    assertEquals(value.length, target.size());
+    assertThat(target.size()).isEqualTo(value.length);
     String json = gson.toJson(target);
     for (int i = (value.length - 1); i >= 0; i--){
-      assertEquals(value[i], target.pop().intValue());
+      assertThat(target.pop().intValue()).isEqualTo(value[i]);
     }
-    assertEquals("[11,13,17]", json);
+    assertThat(json).isEqualTo("[11,13,17]");
   }
 
   public void testNullsInListSerialization() {

From 1d50e3ab049e52b5889b8b55d65c2b295a29ea69 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:14:08 +0200
Subject: [PATCH 16/30] JUnit assertion to Truth assertion

in CollectionTest.testNullsInListSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index e04d99a88d..74182399b4 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -173,7 +173,7 @@ public void testNullsInListSerialization() {
     String expected = "[\"foo\",null,\"bar\"]";
     Type typeOfList = new TypeToken<List<String>>() {}.getType();
     String json = gson.toJson(list, typeOfList);
-    assertEquals(expected, json);
+    assertThat(json).isEqualTo(expected);
   }
 
   public void testNullsInListDeserialization() {

From 49e355d6e7f060e98f819520978115696beb945d Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:14:53 +0200
Subject: [PATCH 17/30] JUnit assertion to Truth assertion

in CollectionTest.testNullsInListDeserialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 74182399b4..c81770fff8 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -185,7 +185,7 @@ public void testNullsInListDeserialization() {
     Type expectedType = new TypeToken<List<String>>() {}.getType();
     List<String> target = gson.fromJson(json, expectedType);
     for (int i = 0; i < expected.size(); ++i) {
-      assertEquals(expected.get(i), target.get(i));
+      assertThat(target.get(i)).isEqualTo(expected.get(i));
     }
   }
 

From 7819e74385e0190b8c6acfac425eb32f81069960 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:15:59 +0200
Subject: [PATCH 18/30] JUnit assertion to Truth assertion

in CollectionTest.testCollectionOfObjectSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index c81770fff8..5bdb251c08 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -193,10 +193,10 @@ public void testCollectionOfObjectSerialization() {
     List<Object> target = new ArrayList<Object>();
     target.add("Hello");
     target.add("World");
-    assertEquals("[\"Hello\",\"World\"]", gson.toJson(target));
+    assertThat(gson.toJson(target)).isEqualTo("[\"Hello\",\"World\"]");
 
     Type type = new TypeToken<List<Object>>() {}.getType();
-    assertEquals("[\"Hello\",\"World\"]", gson.toJson(target, type));
+    assertThat(gson.toJson(target, type)).isEqualTo("[\"Hello\",\"World\"]");
   }
 
   public void testCollectionOfObjectWithNullSerialization() {

From 372852bb9ab4511d66aa2f10735121551dada8b4 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:17:09 +0200
Subject: [PATCH 19/30] JUnit assertion to Truth assertion

in CollectionTest.testCollectionOfObjectWithNullSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 5bdb251c08..ee9f211778 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -204,10 +204,12 @@ public void testCollectionOfObjectWithNullSerialization() {
     target.add("Hello");
     target.add(null);
     target.add("World");
-    assertEquals("[\"Hello\",null,\"World\"]", gson.toJson(target));
+    assertThat(gson.toJson(target)).isEqualTo("[\"Hello\",null,\"World\"]");
 
     Type type = new TypeToken<List<Object>>() {}.getType();
     assertEquals("[\"Hello\",null,\"World\"]", gson.toJson(target, type));
+    assertThat(gson.toJson(target, type)).isEqualTo("[\"Hello\",null,\"World\"]");
+
   }
 
   public void testCollectionOfStringsSerialization() {

From 8fa286921c2bacb47428f2ddc47fc523b8953b3b Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:18:04 +0200
Subject: [PATCH 20/30] JUnit assertion to Truth assertion

in CollectionTest.testCollectionOfStringsSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index ee9f211778..f1eb9d4de6 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -207,7 +207,6 @@ public void testCollectionOfObjectWithNullSerialization() {
     assertThat(gson.toJson(target)).isEqualTo("[\"Hello\",null,\"World\"]");
 
     Type type = new TypeToken<List<Object>>() {}.getType();
-    assertEquals("[\"Hello\",null,\"World\"]", gson.toJson(target, type));
     assertThat(gson.toJson(target, type)).isEqualTo("[\"Hello\",null,\"World\"]");
 
   }
@@ -216,7 +215,7 @@ public void testCollectionOfStringsSerialization() {
     List<String> target = new ArrayList<String>();
     target.add("Hello");
     target.add("World");
-    assertEquals("[\"Hello\",\"World\"]", gson.toJson(target));
+    assertThat(gson.toJson(target)).isEqualTo("[\"Hello\",\"World\"]");
   }
 
   public void testCollectionOfBagOfPrimitivesSerialization() {

From 098d7bbf063e246a6edc3840859d2df073d8c2e7 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:19:20 +0200
Subject: [PATCH 21/30] JUnit assertion to Truth assertion

in CollectionTest.testCollectionOfBagOfPrimitivesSerialization
---
 .../java/com/google/gson/functional/CollectionTest.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index f1eb9d4de6..d173289faa 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -226,10 +226,10 @@ public void testCollectionOfBagOfPrimitivesSerialization() {
     target.add(objB);
 
     String result = gson.toJson(target);
-    assertTrue(result.startsWith("["));
-    assertTrue(result.endsWith("]"));
+    assertThat(result.startsWith("[")).isTrue();
+    assertThat(result.endsWith("]")).isTrue();
     for (BagOfPrimitives obj : target) {
-      assertTrue(result.contains(obj.getExpectedJson()));
+      assertThat(result.contains(obj.getExpectedJson())).isTrue();
     }
   }
 

From d879fe53aed92827e2bb070451c8e178592569dd Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:20:15 +0200
Subject: [PATCH 22/30] JUnit assertion to Truth assertion

in CollectionTest.testRawCollectionSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index d173289faa..1ab18519d3 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -253,7 +253,7 @@ public void testRawCollectionSerialization() {
     BagOfPrimitives bag1 = new BagOfPrimitives();
     Collection target = Arrays.asList(bag1, bag1);
     String json = gson.toJson(target);
-    assertTrue(json.contains(bag1.getExpectedJson()));
+    assertThat(json.contains(bag1.getExpectedJson())).isTrue();
   }
 
   @SuppressWarnings("rawtypes")

From 2a25a9a916449c1c0be9152d8094026c4809995d Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:20:59 +0200
Subject: [PATCH 23/30] JUnit assertion to Truth assertion

in CollectionTest.testRawCollectionDeserializationNotAlllowed
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 1ab18519d3..144be481d6 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -265,8 +265,8 @@ public void testRawCollectionDeserializationNotAlllowed() {
 
     json = "[\"Hello\", \"World\"]";
     Collection strings = gson.fromJson(json, Collection.class);
-    assertTrue(strings.contains("Hello"));
-    assertTrue(strings.contains("World"));
+    assertThat(strings.contains("Hello")).isTrue();
+    assertThat(strings.contains("World")).isTrue();
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})

From 5cfcda68b758720be0a5abb6dff5d0f0279b8811 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:22:31 +0200
Subject: [PATCH 24/30] JUnit assertion to Truth assertion

in CollectionTest.testRawCollectionOfBagOfPrimitivesNotAllowed
---
 .../java/com/google/gson/functional/CollectionTest.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 144be481d6..ee3d26bd95 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -274,13 +274,13 @@ public void testRawCollectionOfBagOfPrimitivesNotAllowed() {
     BagOfPrimitives bag = new BagOfPrimitives(10, 20, false, "stringValue");
     String json = '[' + bag.getExpectedJson() + ',' + bag.getExpectedJson() + ']';
     Collection target = gson.fromJson(json, Collection.class);
-    assertEquals(2, target.size());
+    assertThat(target.size()).isEqualTo(2);
     for (Object bag1 : target) {
       // Gson 2.0 converts raw objects into maps
       Map<String, Object> values = (Map<String, Object>) bag1;
-      assertTrue(values.containsValue(10.0));
-      assertTrue(values.containsValue(20.0));
-      assertTrue(values.containsValue("stringValue"));
+      assertThat(values.containsValue(10.0)).isTrue();
+      assertThat(values.containsValue(20.0)).isTrue();
+      assertThat(values.containsValue("stringValue")).isTrue();
     }
   }
 

From 0a4dfb922c5858f7c9d7c120e95243fddd53f98a Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:23:33 +0200
Subject: [PATCH 25/30] JUnit assertion to Truth assertion

in CollectionTest.testWildcardPrimitiveCollectionSerilaization
---
 .../test/java/com/google/gson/functional/CollectionTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index ee3d26bd95..54ed97677b 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -288,10 +288,9 @@ public void testWildcardPrimitiveCollectionSerilaization() throws Exception {
     Collection<? extends Integer> target = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9);
     Type collectionType = new TypeToken<Collection<? extends Integer>>() { }.getType();
     String json = gson.toJson(target, collectionType);
-    assertEquals("[1,2,3,4,5,6,7,8,9]", json);
-
+    assertThat(json).isEqualTo("[1,2,3,4,5,6,7,8,9]");
     json = gson.toJson(target);
-    assertEquals("[1,2,3,4,5,6,7,8,9]", json);
+    assertThat(json).isEqualTo("[1,2,3,4,5,6,7,8,9]");
   }
 
   public void testWildcardPrimitiveCollectionDeserilaization() throws Exception {

From 3d83b7046fd4244df87514cf15fd3c23d4df2339 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:24:45 +0200
Subject: [PATCH 26/30] JUnit assertion to Truth assertion

in CollectionTest.testWildcardPrimitiveCollectionDeserilaization
---
 .../java/com/google/gson/functional/CollectionTest.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 54ed97677b..fecf5e8add 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -297,9 +297,10 @@ public void testWildcardPrimitiveCollectionDeserilaization() throws Exception {
     String json = "[1,2,3,4,5,6,7,8,9]";
     Type collectionType = new TypeToken<Collection<? extends Integer>>() { }.getType();
     Collection<? extends Integer> target = gson.fromJson(json, collectionType);
-    assertEquals(9, target.size());
-    assertTrue(target.contains(1));
-    assertTrue(target.contains(9));
+    assertThat(target.size()).isEqualTo(9);
+
+    assertThat(target.contains(1)).isTrue();
+    assertThat(target.contains(9)).isTrue();
   }
 
   public void testWildcardCollectionField() throws Exception {

From 7b5b11dd10662b6f7cca7f5f85aca110fd074258 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:27:42 +0200
Subject: [PATCH 27/30] JUnit assertion to Truth assertion

in CollectionTest.testFieldIsArrayList
---
 .../com/google/gson/functional/CollectionTest.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index fecf5e8add..59c249c608 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -312,14 +312,14 @@ public void testWildcardCollectionField() throws Exception {
 
     ObjectWithWildcardCollection target = new ObjectWithWildcardCollection(collection);
     String json = gson.toJson(target);
-    assertTrue(json.contains(objA.getExpectedJson()));
-    assertTrue(json.contains(objB.getExpectedJson()));
+    assertThat(json.contains(objA.getExpectedJson())).isTrue();
+    assertThat(json.contains(objB.getExpectedJson())).isTrue();
 
     target = gson.fromJson(json, ObjectWithWildcardCollection.class);
     Collection<? extends BagOfPrimitives> deserializedCollection = target.getCollection();
-    assertEquals(2, deserializedCollection.size());
-    assertTrue(deserializedCollection.contains(objA));
-    assertTrue(deserializedCollection.contains(objB));
+    assertThat(deserializedCollection.size()).isEqualTo(2);
+    assertThat(deserializedCollection.contains(objA)).isTrue();
+    assertThat(deserializedCollection.contains(objB)).isTrue();
   }
 
   public void testFieldIsArrayList() {
@@ -327,9 +327,9 @@ public void testFieldIsArrayList() {
     object.longs.add(1L);
     object.longs.add(3L);
     String json = gson.toJson(object, HasArrayListField.class);
-    assertEquals("{\"longs\":[1,3]}", json);
+    assertThat(json).isEqualTo("{\"longs\":[1,3]}");
     HasArrayListField copy = gson.fromJson("{\"longs\":[1,3]}", HasArrayListField.class);
-    assertEquals(Arrays.asList(1L, 3L), copy.longs);
+    assertThat(copy.longs).isEqualTo(Arrays.asList(1L, 3L));
   }
   
   public void testUserCollectionTypeAdapter() {

From 9f491ecd633171727f923be79404d180de0b3fe4 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:32:36 +0200
Subject: [PATCH 28/30] JUnit assertion to Truth assertion

in ObjectWithWildcardCollection.testSetSerialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 59c249c608..839503c2e8 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -388,8 +388,8 @@ public void testSetSerialization() {
     set.add(new Entry(1));
     set.add(new Entry(2));
     String json = gson.toJson(set);
-    assertTrue(json.contains("1"));
-    assertTrue(json.contains("2"));
+    assertThat(json.contains("1")).isTrue();
+    assertThat(json.contains("2")).isTrue();
   }
   public void testSetDeserialization() {
     String json = "[{value:1},{value:2}]";

From 3bc33d9c570af616e36976fd7ffe9aa6a12227db Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:33:49 +0200
Subject: [PATCH 29/30] JUnit assertion to Truth assertion

in ObjectWithWildcardCollection.testSetDeserialization
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 839503c2e8..41d0a5cb47 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -395,9 +395,9 @@ public void testSetDeserialization() {
     String json = "[{value:1},{value:2}]";
     Type type = new TypeToken<Set<Entry>>() {}.getType();
     Set<Entry> set = gson.fromJson(json, type);
-    assertEquals(2, set.size());
+    assertThat(set.size()).isEqualTo(2);
     for (Entry entry : set) {
-      assertTrue(entry.value == 1 || entry.value == 2);
+      assertThat(entry.value == 1 || entry.value == 2).isTrue();
     }
   }
 

From 62dd893df03a4460e1ae9033ad454eb4497cc565 Mon Sep 17 00:00:00 2001
From: Lyes <sadi123@hotmail.fr>
Date: Sun, 10 Apr 2022 19:36:09 +0200
Subject: [PATCH 30/30] JUnit assertion to Truth assertion

in SmallClass.testIssue1107
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 41d0a5cb47..58aaa3bc0f 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -415,8 +415,8 @@ public void testIssue1107() {
             "}";
     BigClass bigClass = new Gson().fromJson(json, BigClass.class);
     SmallClass small = bigClass.inBig.get("key").get(0);
-    assertNotNull(small);
-    assertEquals("hello", small.inSmall);
+    assertThat(small).isNotNull();
+    assertThat(small.inSmall).isEqualTo("hello");
   }
 
 }