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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java

Issue 353163002: [Android] Switch to Gin Java Bridge implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed AwSettingsTest#testBlockNetworkLoadsWithAudio Created 6 years, 5 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/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
index 2525a582e1d6dc4afccc20ecc77b5c75bba70f2e..bf5823b3e47ea87196a7fccadf4aaecacd2ac610 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
@@ -169,9 +169,8 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
executeJavaScript("testObject.setByteArray([42]);");
assertEquals(42, mTestObject.waitForByteArray()[0]);
- // LIVECONNECT_COMPLIANCE: Should convert to numeric char value.
executeJavaScript("testObject.setCharArray([42]);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray([42]);");
assertEquals(42, mTestObject.waitForShortArray()[0]);
@@ -643,7 +642,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
assertEquals(42, mTestObject.waitForByteArray()[0]);
executeJavaScript("testObject.setCharArray(int8_array);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray(int8_array);");
assertEquals(42, mTestObject.waitForShortArray()[0]);
@@ -685,7 +684,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
assertEquals(42, mTestObject.waitForByteArray()[0]);
executeJavaScript("testObject.setCharArray(uint8_array);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray(uint8_array);");
assertEquals(42, mTestObject.waitForShortArray()[0]);
@@ -727,7 +726,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
assertEquals(42, mTestObject.waitForByteArray()[0]);
executeJavaScript("testObject.setCharArray(int16_array);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray(int16_array);");
assertEquals(42, mTestObject.waitForShortArray()[0]);
@@ -769,7 +768,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
assertEquals(42, mTestObject.waitForByteArray()[0]);
executeJavaScript("testObject.setCharArray(uint16_array);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray(uint16_array);");
assertEquals(42, mTestObject.waitForShortArray()[0]);
@@ -811,7 +810,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
assertEquals(42, mTestObject.waitForByteArray()[0]);
executeJavaScript("testObject.setCharArray(int32_array);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray(int32_array);");
assertEquals(42, mTestObject.waitForShortArray()[0]);
@@ -853,7 +852,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
assertEquals(42, mTestObject.waitForByteArray()[0]);
executeJavaScript("testObject.setCharArray(uint32_array);");
- assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+ assertEquals(42, mTestObject.waitForCharArray()[0]);
executeJavaScript("testObject.setShortArray(uint32_array);");
assertEquals(42, mTestObject.waitForShortArray()[0]);

Powered by Google App Engine
This is Rietveld 408576698