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

Unified Diff: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

Issue 2708243004: Auto convert content shell tests to JUnit4 (Closed)
Patch Set: Remove test that failed Created 3 years, 10 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: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
index 3fa2a4deb28cfaefd9f59d8f5d1f6d24de18b4f8..a620aad1785cf4082acf4e56432d2d8ec91e9580 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
@@ -16,6 +16,7 @@ import android.os.PowerManager;
import android.text.TextUtils;
import android.view.ViewGroup;
+import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.BaseActivityInstrumentationTestCase;
import org.chromium.base.test.util.CallbackHelper;
@@ -65,6 +66,7 @@ public class ContentShellTestBase
@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
@SuppressWarnings("deprecation")
private void assertScreenIsOn() {
+ Log.d("#YOLAND", "Asserting Screen is On");
PowerManager pm = (PowerManager) getInstrumentation().getContext().getSystemService(
Context.POWER_SERVICE);
@@ -73,6 +75,7 @@ public class ContentShellTestBase
} else {
assertTrue("Many tests will fail if the screen is not on.", pm.isScreenOn());
}
+ Log.d("#YOLAND", "Done asserting");
}
/**
@@ -86,6 +89,7 @@ public class ContentShellTestBase
if (url != null) intent.setData(Uri.parse(url));
intent.setComponent(new ComponentName(getInstrumentation().getTargetContext(),
ContentShellActivity.class));
+ Log.d("#YOLAND", "Intent: " + intent.toString());
setActivityIntent(intent);
return getActivity();
}

Powered by Google App Engine
This is Rietveld 408576698