Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java

Issue 2766373004: Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4 (Closed)
Patch Set: nits and rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java
index c25f897c84695a0f5c808226c66ce2485abad1e0..8deda916b9de15221bca3918673da127e54ca550 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java
@@ -8,19 +8,25 @@ import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
/**
* Hardware acceleration-related manifest tests.
*/
-public class ManifestHWATest extends InstrumentationTestCase {
-
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class ManifestHWATest {
+ @Test
@SmallTest
public void testAccelerationDisabled() throws Exception {
- Context context = getInstrumentation().getTargetContext();
+ Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
PackageInfo info = context.getPackageManager().getPackageInfo(
context.getApplicationInfo().packageName,
PackageManager.GET_ACTIVITIES);
@@ -32,7 +38,8 @@ public class ManifestHWATest extends InstrumentationTestCase {
if (ChromeActivity.class.isAssignableFrom(activityClass)) {
// Every activity derived from ChromeActivity must disable hardware
// acceleration in the manifest.
- assertTrue(0 == (activityInfo.flags & ActivityInfo.FLAG_HARDWARE_ACCELERATED));
+ Assert.assertTrue(
+ 0 == (activityInfo.flags & ActivityInfo.FLAG_HARDWARE_ACCELERATED));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698