Merge pull request #432 from DevDengChao/refactor/truth

Replace Assert.assertThat with Truth.assertThat

Author: brettchabot

runner/AndroidJunitRunnerSample/app/build.gradle

@@ -52,4 +52,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
     androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
     androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
+
+    // https://truth.dev/
+    androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
 }

runner/AndroidJunitRunnerSample/app/src/androidTest/java/com/example/android/testing/androidjunitrunnersample/CalculatorAddParameterizedTest.java

@@ -16,21 +16,18 @@
 
 package com.example.android.testing.androidjunitrunnersample;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.runners.Parameterized.Parameters;
+
+import androidx.test.filters.SmallTest;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import androidx.test.filters.SmallTest;
-
-import java.lang.Iterable;
 import java.util.Arrays;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.runners.Parameterized.Parameters;
-
 
 /**
  * JUnit4 tests for the calculator's add logic.
@@ -73,7 +70,7 @@ public static Iterable<Object[]> data() {
      * to reuse them in your tests.
      */
     public CalculatorAddParameterizedTest(double operandOne, double operandTwo,
-            double expectedResult) {
+                                          double expectedResult) {
 
         mOperandOne = operandOne;
         mOperandTwo = operandTwo;
@@ -88,7 +85,7 @@ public void setUp() {
     @Test
     public void testAdd_TwoNumbers() {
         double resultAdd = mCalculator.add(mOperandOne, mOperandTwo);
-        assertThat(resultAdd, is(equalTo(mExpectedResult)));
+        assertThat(resultAdd).isEqualTo(mExpectedResult);
     }
 
 }

runner/AndroidJunitRunnerSample/app/src/androidTest/java/com/example/android/testing/androidjunitrunnersample/CalculatorTest.java

@@ -16,16 +16,15 @@
 
 package com.example.android.testing.androidjunitrunnersample;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static com.google.common.truth.Truth.assertThat;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 
 
 /**
@@ -45,25 +44,25 @@ public void setUp() {
     @Test
     public void addTwoNumbers() {
         double resultAdd = mCalculator.add(1d, 1d);
-        assertThat(resultAdd, is(equalTo(2d)));
+        assertThat(resultAdd).isEqualTo(2d);
     }
 
     @Test
     public void subTwoNumbers() {
         double resultSub = mCalculator.sub(1d, 1d);
-        assertThat(resultSub, is(equalTo(0d)));
+        assertThat(resultSub).isEqualTo(0d);
     }
 
     @Test
     public void subWorksWithNegativeResult() {
         double resultSub = mCalculator.sub(1d, 17d);
-        assertThat(resultSub, is(equalTo(-16d)));
+        assertThat(resultSub).isEqualTo(-16d);
     }
 
     @Test
     public void divTwoNumbers() {
         double resultDiv = mCalculator.div(32d,2d);
-        assertThat(resultDiv, is(equalTo(16d)));
+        assertThat(resultDiv).isEqualTo(16d);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -74,7 +73,7 @@ public void divDivideByZeroThrows() {
     @Test
     public void mulTwoNumbers() {
         double resultMul = mCalculator.mul(32d, 2d);
-        assertThat(resultMul, is(equalTo(64d)));
+        assertThat(resultMul).isEqualTo(64d);
     }
 
 }

runner/AndroidJunitRunnerSample/build.gradle

@@ -32,4 +32,5 @@ ext {
     runnerVersion = "1.5.0-alpha03"
     rulesVersion = "1.4.1-alpha06"
     espressoVersion = "3.5.0-alpha06"
+    truthVersion = "1.1.3"
 }

runner/AndroidTestOrchestratorSample/app/build.gradle

@@ -50,5 +50,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
     androidTestImplementation 'androidx.test:monitor:' + rootProject.monitorVersion;
     androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
+    androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
     androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion;
+
 }

runner/AndroidTestOrchestratorSample/app/src/androidTest/java/com/example/android/testing/androidtestorchestratorsample/CalculatorAddParameterizedTest.java

@@ -16,6 +16,8 @@
 
 package com.example.android.testing.androidtestorchestratorsample;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,9 +28,6 @@
 import java.lang.Iterable;
 import java.util.Arrays;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.runners.Parameterized.Parameters;
 
 
@@ -88,6 +87,6 @@ public void setUp() {
     @Test
     public void testAdd_TwoNumbers() {
         double resultAdd = mCalculator.add(mOperandOne, mOperandTwo);
-        assertThat(resultAdd, is(equalTo(mExpectedResult)));
+        assertThat(resultAdd).isEqualTo(mExpectedResult);
     }
 }

runner/AndroidTestOrchestratorSample/build.gradle

@@ -34,4 +34,5 @@ ext {
     rulesVersion = "1.4.1-alpha06"
     espressoVersion = "3.5.0-alpha06"
     orchestratorVersion = "1.4.2-alpha03"
+    truthVersion = "1.1.3"
 }

runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle

@@ -34,6 +34,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
     androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
     androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
+    androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
     androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion
     androidTestUtil 'androidx.test.services:test-services:' + rootProject.testServicesVersion
+
 }

runner/AndroidTestOrchestratorWithTestCoverageSample/app/src/androidTest/java/com/example/android/testing/androidtestorchestratorsample/CalculatorAddParameterizedTest.java

@@ -16,6 +16,8 @@
 
 package com.example.android.testing.androidtestorchestratorsample;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,9 +28,6 @@
 import java.lang.Iterable;
 import java.util.Arrays;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.runners.Parameterized.Parameters;
 
 
@@ -88,6 +87,6 @@ public void setUp() {
     @Test
     public void testAdd_TwoNumbers() {
         double resultAdd = mCalculator.add(mOperandOne, mOperandTwo);
-        assertThat(resultAdd, is(equalTo(mExpectedResult)));
+        assertThat(resultAdd).isEqualTo(mExpectedResult);
     }
 }

runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle

@@ -33,4 +33,5 @@ ext {
     rulesVersion = "1.4.1-alpha03"
     testServicesVersion = "1.4.1-alpha03"
     espressoVersion = "3.5.0-alpha03"
+    truthVersion = "1.1.3"
 }