aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTai Kuo <taikuo@google.com>2020-07-30 19:36:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-30 19:36:00 +0000
commit146aa7bd5562b2bc456a0f4915e4fe04d274011a (patch)
tree09a1f5af396b1a7581185cf1439f278253b9cc16
parente614619d300cec2d8de1bd35182b7909a9a03a31 (diff)
parent29d76aa4885f72ca62968ee086b5a25376a2c0a0 (diff)
downloadwalt-146aa7bd5562b2bc456a0f4915e4fe04d274011a.tar.gz
walt: app: fix Lint errors in the test folder am: 085d6d10f9 am: 96cc3992d5 am: ae2ba55ccb am: 1fdbab05fa am: 2abcee4dde am: 29d76aa488
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/walt/+/11887676 Change-Id: I3edc5c264726990eea5f6f92774d62e0167ed8e9
-rw-r--r--android/WALT/app/src/test/java/org/chromium/latency/walt/AccelerometerFragmentTest.java2
-rw-r--r--android/WALT/app/src/test/java/org/chromium/latency/walt/HistogramChartTest.java2
-rw-r--r--android/WALT/app/src/test/java/org/chromium/latency/walt/TraceLoggerTest.java2
-rw-r--r--android/WALT/app/src/test/java/org/chromium/latency/walt/UtilsTest.java4
4 files changed, 5 insertions, 5 deletions
diff --git a/android/WALT/app/src/test/java/org/chromium/latency/walt/AccelerometerFragmentTest.java b/android/WALT/app/src/test/java/org/chromium/latency/walt/AccelerometerFragmentTest.java
index b29ace8..7a70426 100644
--- a/android/WALT/app/src/test/java/org/chromium/latency/walt/AccelerometerFragmentTest.java
+++ b/android/WALT/app/src/test/java/org/chromium/latency/walt/AccelerometerFragmentTest.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class AccelerometerFragmentTest {
diff --git a/android/WALT/app/src/test/java/org/chromium/latency/walt/HistogramChartTest.java b/android/WALT/app/src/test/java/org/chromium/latency/walt/HistogramChartTest.java
index 8365719..c43eca1 100644
--- a/android/WALT/app/src/test/java/org/chromium/latency/walt/HistogramChartTest.java
+++ b/android/WALT/app/src/test/java/org/chromium/latency/walt/HistogramChartTest.java
@@ -29,7 +29,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
import java.util.ArrayList;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
diff --git a/android/WALT/app/src/test/java/org/chromium/latency/walt/TraceLoggerTest.java b/android/WALT/app/src/test/java/org/chromium/latency/walt/TraceLoggerTest.java
index ed617cb..f3a3c0d 100644
--- a/android/WALT/app/src/test/java/org/chromium/latency/walt/TraceLoggerTest.java
+++ b/android/WALT/app/src/test/java/org/chromium/latency/walt/TraceLoggerTest.java
@@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
diff --git a/android/WALT/app/src/test/java/org/chromium/latency/walt/UtilsTest.java b/android/WALT/app/src/test/java/org/chromium/latency/walt/UtilsTest.java
index 86513f4..33d8454 100644
--- a/android/WALT/app/src/test/java/org/chromium/latency/walt/UtilsTest.java
+++ b/android/WALT/app/src/test/java/org/chromium/latency/walt/UtilsTest.java
@@ -25,9 +25,9 @@ import java.util.List;
import java.util.Random;
import static java.lang.Double.NaN;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class UtilsTest {