summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests/src
diff options
context:
space:
mode:
Diffstat (limited to 'android_webview/javatests/src')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java3
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java9
2 files changed, 5 insertions, 7 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
index abf9094..f417b69 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
@@ -4,7 +4,6 @@
package org.chromium.android_webview.test;
-import android.graphics.Color;
import android.test.suitebuilder.annotation.SmallTest;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
@@ -321,7 +320,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
mOnContentSizeChangedHelper, expectedWidthCss, expectedHeightCss, false);
GraphicsTestUtils.pollForBackgroundColor(
- testContainerView.getAwContents(), Color.rgb(0x22, 0x77, 0x88));
+ testContainerView.getAwContents(), 0xFF227788);
}
@SmallTest
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
index a1a6c07..47aefc5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
@@ -63,16 +63,15 @@ public class AwContentsRenderTest extends AwTestBase {
loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
"data:text/html,<html><head><style>body {background-color:#227788}</style></head>"
+ "<body></body></html>");
- GraphicsTestUtils.pollForBackgroundColor(mAwContents, Color.rgb(0x22, 0x77, 0x88));
+ final int teal = 0xFF227788;
+ GraphicsTestUtils.pollForBackgroundColor(mAwContents, teal);
// Changing the base background should not override CSS background.
setBackgroundColorOnUiThread(Color.MAGENTA);
- assertEquals(Color.rgb(0x22, 0x77, 0x88),
- GraphicsTestUtils.sampleBackgroundColorOnUiThread(mAwContents));
+ assertEquals(teal, GraphicsTestUtils.sampleBackgroundColorOnUiThread(mAwContents));
// ...setting the background is asynchronous, so pause a bit and retest just to be sure.
Thread.sleep(500);
- assertEquals(Color.rgb(0x22, 0x77, 0x88),
- GraphicsTestUtils.sampleBackgroundColorOnUiThread(mAwContents));
+ assertEquals(teal, GraphicsTestUtils.sampleBackgroundColorOnUiThread(mAwContents));
}
@SmallTest