Skip to content

Commit cce0a9b

Browse files
committed
refactor: replace Assert.assertThat with Truth.assertThat
1 parent 5ece086 commit cce0a9b

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,18 @@
1616

1717
package com.example.android.testing.androidjunitrunnersample;
1818

19+
import static com.google.common.truth.Truth.assertThat;
20+
import static org.junit.runners.Parameterized.Parameters;
21+
22+
import androidx.test.filters.SmallTest;
23+
1924
import org.junit.Before;
2025
import org.junit.Test;
2126
import org.junit.runner.RunWith;
2227
import org.junit.runners.Parameterized;
2328

24-
import androidx.test.filters.SmallTest;
25-
26-
import java.lang.Iterable;
2729
import java.util.Arrays;
2830

29-
import static org.hamcrest.CoreMatchers.equalTo;
30-
import static org.hamcrest.CoreMatchers.is;
31-
import static org.junit.Assert.assertThat;
32-
import static org.junit.runners.Parameterized.Parameters;
33-
3431

3532
/**
3633
* JUnit4 tests for the calculator's add logic.
@@ -73,7 +70,7 @@ public static Iterable<Object[]> data() {
7370
* to reuse them in your tests.
7471
*/
7572
public CalculatorAddParameterizedTest(double operandOne, double operandTwo,
76-
double expectedResult) {
73+
double expectedResult) {
7774

7875
mOperandOne = operandOne;
7976
mOperandTwo = operandTwo;
@@ -88,7 +85,7 @@ public void setUp() {
8885
@Test
8986
public void testAdd_TwoNumbers() {
9087
double resultAdd = mCalculator.add(mOperandOne, mOperandTwo);
91-
assertThat(resultAdd, is(equalTo(mExpectedResult)));
88+
assertThat(resultAdd).isEqualTo(mExpectedResult);
9289
}
9390

9491
}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616

1717
package com.example.android.testing.androidjunitrunnersample;
1818

19-
import org.junit.Before;
20-
import org.junit.Test;
21-
import org.junit.runner.RunWith;
19+
import static com.google.common.truth.Truth.assertThat;
2220

2321
import androidx.test.ext.junit.runners.AndroidJUnit4;
2422
import androidx.test.filters.SmallTest;
2523

26-
import static org.hamcrest.CoreMatchers.equalTo;
27-
import static org.hamcrest.CoreMatchers.is;
28-
import static org.junit.Assert.assertThat;
24+
import org.junit.Before;
25+
import org.junit.Test;
26+
import org.junit.runner.RunWith;
27+
2928

3029

3130
/**
@@ -45,25 +44,25 @@ public void setUp() {
4544
@Test
4645
public void addTwoNumbers() {
4746
double resultAdd = mCalculator.add(1d, 1d);
48-
assertThat(resultAdd, is(equalTo(2d)));
47+
assertThat(resultAdd).isEqualTo(2d);
4948
}
5049

5150
@Test
5251
public void subTwoNumbers() {
5352
double resultSub = mCalculator.sub(1d, 1d);
54-
assertThat(resultSub, is(equalTo(0d)));
53+
assertThat(resultSub).isEqualTo(0d);
5554
}
5655

5756
@Test
5857
public void subWorksWithNegativeResult() {
5958
double resultSub = mCalculator.sub(1d, 17d);
60-
assertThat(resultSub, is(equalTo(-16d)));
59+
assertThat(resultSub).isEqualTo(-16d);
6160
}
6261

6362
@Test
6463
public void divTwoNumbers() {
6564
double resultDiv = mCalculator.div(32d,2d);
66-
assertThat(resultDiv, is(equalTo(16d)));
65+
assertThat(resultDiv).isEqualTo(16d);
6766
}
6867

6968
@Test(expected = IllegalArgumentException.class)
@@ -74,7 +73,7 @@ public void divDivideByZeroThrows() {
7473
@Test
7574
public void mulTwoNumbers() {
7675
double resultMul = mCalculator.mul(32d, 2d);
77-
assertThat(resultMul, is(equalTo(64d)));
76+
assertThat(resultMul).isEqualTo(64d);
7877
}
7978

8079
}

0 commit comments

Comments
 (0)