Fix build warnings for tools/tradefed
Test: build locally
Bug: 35471296
Change-Id: I7915b081b8055683877d957731e3f617bbb8c64b
diff --git a/src/com/android/media/tests/CameraLatencyTest.java b/src/com/android/media/tests/CameraLatencyTest.java
index 58c6091..56f003b 100644
--- a/src/com/android/media/tests/CameraLatencyTest.java
+++ b/src/com/android/media/tests/CameraLatencyTest.java
@@ -34,9 +34,10 @@
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
import junit.framework.TestCase;
+import org.junit.Assert;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/com/android/media/tests/CameraPerformanceTest.java b/src/com/android/media/tests/CameraPerformanceTest.java
index a25b42c..a2252e3 100644
--- a/src/com/android/media/tests/CameraPerformanceTest.java
+++ b/src/com/android/media/tests/CameraPerformanceTest.java
@@ -45,8 +45,6 @@
@OptionClass(alias = "camera-framework")
public class CameraPerformanceTest extends CameraTestBase {
- private static final String LOG_TAG = CameraPerformanceTest.class.getSimpleName();
-
public CameraPerformanceTest() {
// Set up the default test info. But this is subject to be overwritten by options passed
// from commands.
diff --git a/src/com/android/media/tests/CameraSettingsTest.java b/src/com/android/media/tests/CameraSettingsTest.java
index bd307b1..7c64eb9 100644
--- a/src/com/android/media/tests/CameraSettingsTest.java
+++ b/src/com/android/media/tests/CameraSettingsTest.java
@@ -30,7 +30,7 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.BufferedReader;
import java.io.File;
diff --git a/src/com/android/media/tests/CameraShotToShotLatencyTest.java b/src/com/android/media/tests/CameraShotToShotLatencyTest.java
index 62aa5b5..c30d5c0 100644
--- a/src/com/android/media/tests/CameraShotToShotLatencyTest.java
+++ b/src/com/android/media/tests/CameraShotToShotLatencyTest.java
@@ -29,7 +29,7 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.BufferedReader;
import java.io.File;
diff --git a/src/com/android/media/tests/CameraStartupTest.java b/src/com/android/media/tests/CameraStartupTest.java
index ac4e8da..c19cd2f 100644
--- a/src/com/android/media/tests/CameraStartupTest.java
+++ b/src/com/android/media/tests/CameraStartupTest.java
@@ -28,7 +28,7 @@
import com.android.tradefed.targetprep.TemperatureThrottlingWaiter;
import com.android.tradefed.util.MultiMap;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.util.Collections;
import java.util.HashMap;
diff --git a/src/com/android/media/tests/CameraStressTest.java b/src/com/android/media/tests/CameraStressTest.java
index 448852f..ca92544 100644
--- a/src/com/android/media/tests/CameraStressTest.java
+++ b/src/com/android/media/tests/CameraStressTest.java
@@ -34,9 +34,10 @@
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
import junit.framework.TestCase;
+import org.junit.Assert;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/com/android/media/tests/CameraTestBase.java b/src/com/android/media/tests/CameraTestBase.java
index e7eceb6..212e65d 100644
--- a/src/com/android/media/tests/CameraTestBase.java
+++ b/src/com/android/media/tests/CameraTestBase.java
@@ -38,7 +38,7 @@
import com.android.tradefed.util.RunUtil;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/src/com/android/media/tests/MediaMemoryTest.java b/src/com/android/media/tests/MediaMemoryTest.java
index 598fd7b..fcc615e 100644
--- a/src/com/android/media/tests/MediaMemoryTest.java
+++ b/src/com/android/media/tests/MediaMemoryTest.java
@@ -36,7 +36,7 @@
import com.android.tradefed.util.FileUtil;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/com/android/media/tests/MediaPlayerStressTest.java b/src/com/android/media/tests/MediaPlayerStressTest.java
index 059b0f9..8c761d5 100644
--- a/src/com/android/media/tests/MediaPlayerStressTest.java
+++ b/src/com/android/media/tests/MediaPlayerStressTest.java
@@ -38,7 +38,7 @@
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/com/android/media/tests/MediaStressTest.java b/src/com/android/media/tests/MediaStressTest.java
index 7280c17..fdcaea0 100644
--- a/src/com/android/media/tests/MediaStressTest.java
+++ b/src/com/android/media/tests/MediaStressTest.java
@@ -31,7 +31,7 @@
import com.android.tradefed.util.FileUtil;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/com/android/media/tests/PanoramaBenchMarkTest.java b/src/com/android/media/tests/PanoramaBenchMarkTest.java
index 1f764fc..355bbb0 100644
--- a/src/com/android/media/tests/PanoramaBenchMarkTest.java
+++ b/src/com/android/media/tests/PanoramaBenchMarkTest.java
@@ -26,7 +26,7 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/com/android/media/tests/VideoEditingMemoryTest.java b/src/com/android/media/tests/VideoEditingMemoryTest.java
index df348fe..67e486e 100644
--- a/src/com/android/media/tests/VideoEditingMemoryTest.java
+++ b/src/com/android/media/tests/VideoEditingMemoryTest.java
@@ -36,7 +36,7 @@
import com.android.tradefed.util.FileUtil;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.File;
import java.io.FileInputStream;
diff --git a/src/com/android/media/tests/VideoEditingPerformanceTest.java b/src/com/android/media/tests/VideoEditingPerformanceTest.java
index 80134df..da9885c 100644
--- a/src/com/android/media/tests/VideoEditingPerformanceTest.java
+++ b/src/com/android/media/tests/VideoEditingPerformanceTest.java
@@ -36,7 +36,7 @@
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.File;
import java.io.FileInputStream;