Standardize (almost) all tests on Truth (square#1242)

* Replace assertj calls with Truth where possible * Update test dependencies * adapters * reflect * codegen * moshi * Add missing inOrder() * Spotless
ZacSweers · Sep 27, 2020 · f192473 · f192473
1 parent acb2836
commit f192473
Show file tree

Hide file tree

Showing 36 changed files with 448 additions and 300 deletions.
diff --git a/adapters/build.gradle.kts b/adapters/build.gradle.kts
@@ -25,5 +25,5 @@ dependencies {
 
   testCompileOnly(Dependencies.jsr305)
   testImplementation(Dependencies.Testing.junit)
-  testImplementation(Dependencies.Testing.assertj)
+  testImplementation(Dependencies.Testing.truth)
 }
diff --git a/adapters/src/test/java/com/squareup/moshi/adapters/EnumJsonAdapterTest.java b/adapters/src/test/java/com/squareup/moshi/adapters/EnumJsonAdapterTest.java
@@ -15,7 +15,7 @@
  */
 package com.squareup.moshi.adapters;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.squareup.moshi.Json;
@@ -48,7 +48,9 @@ public void withoutFallbackValue() throws Exception {
       adapter.fromJson(reader);
       fail();
     } catch (JsonDataException expected) {
-      assertThat(expected).hasMessage("Expected one of [ROCK, PAPER, scr] but was SPOCK at path $");
+      assertThat(expected)
+          .hasMessageThat()
+          .isEqualTo("Expected one of [ROCK, PAPER, scr] but was SPOCK at path $");
     }
     assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT);
   }

diff --git a/adapters/src/test/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactoryTest.java b/adapters/src/test/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactoryTest.java
@@ -15,7 +15,7 @@
  */
 package com.squareup.moshi.adapters;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.squareup.moshi.JsonAdapter;
@@ -84,7 +84,8 @@ public void unregisteredLabelValue() throws IOException {
       fail();
     } catch (JsonDataException expected) {
       assertThat(expected)
-          .hasMessage(
+          .hasMessageThat()
+          .isEqualTo(
               "Expected one of [success, error] for key 'type' but found"
                   + " 'data'. Register a subtype for this label.");
     }
@@ -105,7 +106,7 @@ public void specifiedFallbackSubtype() throws IOException {
     JsonAdapter<Message> adapter = moshi.adapter(Message.class);
 
     Message message = adapter.fromJson("{\"type\":\"data\",\"value\":\"Okay!\"}");
-    assertThat(message).isSameAs(fallbackError);
+    assertThat(message).isSameInstanceAs(fallbackError);
   }
 
   @Test
@@ -176,7 +177,8 @@ public void unregisteredSubtype() {
       adapter.toJson(new EmptyMessage());
     } catch (IllegalArgumentException expected) {
       assertThat(expected)
-          .hasMessage(
+          .hasMessageThat()
+          .isEqualTo(
               "Expected one of [class"
                   + " com.squareup.moshi.adapters.PolymorphicJsonAdapterFactoryTest$Success, class"
                   + " com.squareup.moshi.adapters.PolymorphicJsonAdapterFactoryTest$Error] but found"
@@ -203,7 +205,8 @@ public void unregisteredSubtypeWithDefaultValue() {
       adapter.toJson(new EmptyMessage());
     } catch (IllegalArgumentException expected) {
       assertThat(expected)
-          .hasMessage(
+          .hasMessageThat()
+          .isEqualTo(
               "Expected one of [class"
                   + " com.squareup.moshi.adapters.PolymorphicJsonAdapterFactoryTest$Success, class"
                   + " com.squareup.moshi.adapters.PolymorphicJsonAdapterFactoryTest$Error] but found"
@@ -256,7 +259,9 @@ public void nonStringLabelValue() throws IOException {
       adapter.fromJson("{\"type\":{},\"value\":\"Okay!\"}");
       fail();
     } catch (JsonDataException expected) {
-      assertThat(expected).hasMessage("Expected a string but was BEGIN_OBJECT at path $.type");
+      assertThat(expected)
+          .hasMessageThat()
+          .isEqualTo("Expected a string but was BEGIN_OBJECT at path $.type");
     }
   }
 
@@ -276,7 +281,9 @@ public void nonObjectDoesNotConsume() throws IOException {
       adapter.fromJson(reader);
       fail();
     } catch (JsonDataException expected) {
-      assertThat(expected).hasMessage("Expected BEGIN_OBJECT but was STRING at path $");
+      assertThat(expected)
+          .hasMessageThat()
+          .isEqualTo("Expected BEGIN_OBJECT but was STRING at path $");
     }
     assertThat(reader.nextString()).isEqualTo("Failure");
     assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT);
@@ -313,7 +320,7 @@ public void uniqueLabels() {
       factory.withSubtype(Error.class, "data");
       fail();
     } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessage("Labels must be unique.");
+      assertThat(expected).hasMessageThat().isEqualTo("Labels must be unique.");
     }
   }
 

diff --git a/adapters/src/test/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapterTest.java b/adapters/src/test/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapterTest.java
@@ -15,7 +15,7 @@
  */
 package com.squareup.moshi.adapters;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static com.google.common.truth.Truth.assertThat;
 
 import com.squareup.moshi.JsonAdapter;
 import java.util.Calendar;

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -49,8 +49,8 @@ object Dependencies {
 
   object Testing {
     const val assertj = "org.assertj:assertj-core:3.11.1"
-    const val compileTesting = "com.github.tschuchortdev:kotlin-compile-testing:1.2.10"
-    const val junit = "junit:junit:4.12"
-    const val truth = "com.google.truth:truth:1.0"
+    const val compileTesting = "com.github.tschuchortdev:kotlin-compile-testing:1.2.11"
+    const val junit = "junit:junit:4.13"
+    const val truth = "com.google.truth:truth:1.0.1"
   }
 }
diff --git a/kotlin/codegen/build.gradle.kts b/kotlin/codegen/build.gradle.kts
@@ -76,7 +76,6 @@ dependencies {
   testImplementation(Dependencies.KotlinPoet.metadataSpecs)
   testImplementation(Dependencies.KotlinPoet.elementsClassInspector)
   testImplementation(Dependencies.Testing.junit)
-  testImplementation(Dependencies.Testing.assertj)
   testImplementation(Dependencies.Testing.truth)
   testImplementation(Dependencies.Testing.compileTesting)
   testImplementation(Dependencies.okio2)

diff --git a/.../codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt b/.../codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt
@@ -15,12 +15,12 @@
  */
 package com.squareup.moshi.kotlin.codegen
 
+import com.google.common.truth.Truth.assertThat
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
 import com.tschuchort.compiletesting.SourceFile.Companion.kotlin
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
@@ -616,7 +616,7 @@ class JsonClassCodegenProcessorTest {
 
     result.generatedFiles.filter { it.extension == "pro" }.forEach { generatedFile ->
       when (generatedFile.nameWithoutExtension) {
-        "moshi-testPackage.Aliases" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.Aliases" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.Aliases
           -keepnames class testPackage.Aliases
@@ -626,7 +626,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.Simple" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.Simple" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.Simple
           -keepnames class testPackage.Simple
@@ -636,7 +636,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.Generic" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.Generic" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.Generic
           -keepnames class testPackage.Generic
@@ -646,7 +646,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.UsingQualifiers" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.UsingQualifiers" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.UsingQualifiers
           -keepnames class testPackage.UsingQualifiers
@@ -659,7 +659,7 @@ class JsonClassCodegenProcessorTest {
           -keep @interface testPackage.MyQualifier
           """.trimIndent()
         )
-        "moshi-testPackage.MixedTypes" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.MixedTypes" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.MixedTypes
           -keepnames class testPackage.MixedTypes
@@ -669,7 +669,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.DefaultParams" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.DefaultParams" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.DefaultParams
           -keepnames class testPackage.DefaultParams
@@ -685,7 +685,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.Complex" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.Complex" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.Complex
           -keepnames class testPackage.Complex
@@ -704,7 +704,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.MultipleMasks" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.MultipleMasks" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.MultipleMasks
           -keepnames class testPackage.MultipleMasks
@@ -720,7 +720,7 @@ class JsonClassCodegenProcessorTest {
           }
           """.trimIndent()
         )
-        "moshi-testPackage.NestedType.NestedSimple" -> assertThat(generatedFile).hasContent(
+        "moshi-testPackage.NestedType.NestedSimple" -> assertThat(generatedFile.readText()).contains(
           """
           -if class testPackage.NestedType${'$'}NestedSimple
           -keepnames class testPackage.NestedType${'$'}NestedSimple

diff --git a/kotlin/reflect/build.gradle.kts b/kotlin/reflect/build.gradle.kts
@@ -25,5 +25,5 @@ dependencies {
 
   testImplementation(kotlin("test"))
   testImplementation(Dependencies.Testing.junit)
-  testImplementation(Dependencies.Testing.assertj)
+  testImplementation(Dependencies.Testing.truth)
 }
diff --git a/kotlin/reflect/src/test/java/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt b/kotlin/reflect/src/test/java/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt
@@ -15,9 +15,9 @@
  */
 package com.squareup.moshi.kotlin.reflect
 
+import com.google.common.truth.Truth.assertThat
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class KotlinJsonAdapterTest {

diff --git a/kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/DualKotlinTest.kt b/kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/DualKotlinTest.kt
@@ -15,6 +15,7 @@
  */
 package com.squareup.moshi.kotlin
 
+import com.google.common.truth.Truth.assertThat
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonAdapter
@@ -26,7 +27,6 @@ import com.squareup.moshi.ToJson
 import com.squareup.moshi.Types
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import com.squareup.moshi.kotlin.reflect.adapter
-import org.assertj.core.api.Assertions.assertThat
 import org.intellij.lang.annotations.Language
 import org.junit.Assert.fail
 import org.junit.Test
@@ -87,7 +87,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("""{"a":4}""")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Required value 'b' missing at $")
+      assertThat(expected).hasMessageThat().isEqualTo("Required value 'b' missing at $")
     }
   }
 
@@ -102,7 +102,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("""{"a":4}""")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Required value 'b' (JSON name 'bPrime') missing at \$")
+      assertThat(expected).hasMessageThat().isEqualTo("Required value 'b' (JSON name 'bPrime') missing at \$")
     }
   }
 
@@ -117,7 +117,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("{\"a\":null}")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Non-null value 'a' was null at \$.a")
+      assertThat(expected).hasMessageThat().isEqualTo("Non-null value 'a' was null at \$.a")
     }
   }
 
@@ -138,7 +138,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("{\"a\":\"hello\"}")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Non-null value 'a' was null at \$.a")
+      assertThat(expected).hasMessageThat().isEqualTo("Non-null value 'a' was null at \$.a")
     }
   }
 
@@ -155,7 +155,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("{\"aPrime\":null}")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Non-null value 'a' (JSON name 'aPrime') was null at \$.aPrime")
+      assertThat(expected).hasMessageThat().isEqualTo("Non-null value 'a' (JSON name 'aPrime') was null at \$.aPrime")
     }
   }
 
@@ -176,7 +176,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("{\"aPrime\":\"hello\"}")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Non-null value 'a' (JSON name 'aPrime') was null at \$.aPrime")
+      assertThat(expected).hasMessageThat().isEqualTo("Non-null value 'a' (JSON name 'aPrime') was null at \$.aPrime")
     }
   }
 
@@ -193,7 +193,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("{\"a\":null}")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Non-null value 'a' was null at \$.a")
+      assertThat(expected).hasMessageThat().isEqualTo("Non-null value 'a' was null at \$.a")
     }
   }
 
@@ -214,7 +214,7 @@ class DualKotlinTest(useReflection: Boolean) {
       jsonAdapter.fromJson("{\"a\":\"hello\"}")
       fail()
     } catch (expected: JsonDataException) {
-      assertThat(expected).hasMessage("Non-null value 'a' was null at \$.a")
+      assertThat(expected).hasMessageThat().isEqualTo("Non-null value 'a' was null at \$.a")
     }
   }
 

diff --git a/...tests/src/test/kotlin/com/squareup/moshi/kotlin/codegen/ComplexGenericsInheritanceTest.kt b/...tests/src/test/kotlin/com/squareup/moshi/kotlin/codegen/ComplexGenericsInheritanceTest.kt
@@ -17,10 +17,10 @@
 
 package com.squareup.moshi.kotlin.codegen
 
+import com.google.common.truth.Truth.assertThat
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.adapter
-import org.assertj.core.api.Assertions.assertThat
 import org.intellij.lang.annotations.Language
 import org.junit.Test