Change junit.framework.Assert to org.junit.Assert

The first one is deprecated after JUnit 4.12 update.

Test: unit tests
Change-Id: I50ff947c1f3725b390bd73504501f9e19c49b2d5

7 files changed, 9 insertions, 10 deletions

diff --git a/src/com/android/tradefed/result/CodeCoverageReporter.java b/src/com/android/tradefed/result/CodeCoverageReporter.java
index 05abe8c0c..67f4ac6e0 100644
--- a/src/com/android/tradefed/result/CodeCoverageReporter.java
+++ b/src/com/android/tradefed/result/CodeCoverageReporter.java
@@ -29,10 +29,8 @@ import com.android.tradefed.util.IRunUtil;
 import com.android.tradefed.util.RunUtil;
 import com.android.tradefed.util.ZipUtil2;
 
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
 import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.junit.Assert;
 
 import java.io.File;
 import java.io.IOException;
@@ -259,7 +257,7 @@ public class CodeCoverageReporter implements ITestInvocationListener {
      * Tries to find emma.jar in same location as ddmlib.jar.
      *
      * @return full path to emma jar file
-     * @throws AssertionFailedError if could not find emma jar
+     * @throws AssertionError if could not find emma jar
      */
     String findEmmaJarPath() {
         String ddmlibPath = IDevice.class.getProtectionDomain()
diff --git a/src/com/android/tradefed/targetprep/SdkAvdPreparer.java b/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
index e393e9285..33555c321 100644
--- a/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
+++ b/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
@@ -35,7 +35,7 @@ import com.android.tradefed.util.RunUtil;
 
 import com.google.common.annotations.VisibleForTesting;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java b/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java
index 195e37e72..dc88142d7 100644
--- a/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java
+++ b/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java
@@ -28,7 +28,7 @@ import com.android.tradefed.targetprep.ITargetPreparer;
 import com.android.tradefed.util.IRunUtil;
 import com.android.tradefed.util.RunUtil;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/src/com/android/tradefed/testtype/InstrumentationTest.java b/src/com/android/tradefed/testtype/InstrumentationTest.java
index 3db1f65d0..07c397294 100644
--- a/src/com/android/tradefed/testtype/InstrumentationTest.java
+++ b/src/com/android/tradefed/testtype/InstrumentationTest.java
@@ -40,9 +40,10 @@ import com.android.tradefed.util.AbiFormatter;
 import com.android.tradefed.util.ListInstrumentationParser;
 import com.android.tradefed.util.ListInstrumentationParser.InstrumentationTarget;
 import com.android.tradefed.util.StringEscapeUtils;
+
 import com.google.common.annotations.VisibleForTesting;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/android/tradefed/testtype/PythonUnitTestRunner.java b/src/com/android/tradefed/testtype/PythonUnitTestRunner.java
index bc926ab84..ebe4301f9 100644
--- a/src/com/android/tradefed/testtype/PythonUnitTestRunner.java
+++ b/src/com/android/tradefed/testtype/PythonUnitTestRunner.java
@@ -30,7 +30,7 @@ import com.android.tradefed.util.CommandStatus;
 import com.android.tradefed.util.IRunUtil;
 import com.android.tradefed.util.RunUtil;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/android/tradefed/testtype/UiAutomatorTest.java b/src/com/android/tradefed/testtype/UiAutomatorTest.java
index 98079ecbf..b2f3a4d73 100644
--- a/src/com/android/tradefed/testtype/UiAutomatorTest.java
+++ b/src/com/android/tradefed/testtype/UiAutomatorTest.java
@@ -36,7 +36,7 @@ import com.android.tradefed.util.RunUtil;
 import com.android.tradefed.util.StreamUtil;
 import com.android.tradefed.util.ZipUtil;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/com/android/tradefed/util/SimplePerfUtil.java b/src/com/android/tradefed/util/SimplePerfUtil.java
index 41148a6a2..8a9117843 100644
--- a/src/com/android/tradefed/util/SimplePerfUtil.java
+++ b/src/com/android/tradefed/util/SimplePerfUtil.java
@@ -19,7 +19,7 @@ import com.android.ddmlib.IShellOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;