summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-06-30 08:08:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-30 08:08:28 +0000
commit9324764e9e45cbfdcf28126f670c79e3dc0034a0 (patch)
treee2783186f6c1923aeed2a69383a9bdea7e36afec
parent943dfc32b956d94255b4dd3b57d566e5c081989d (diff)
parent1e22227117f6ad86e9efe2a2ca2cca1fc456f07e (diff)
Merge "Update test expectations."
-rw-r--r--core/tests/coretests/src/android/text/method/ForwardDeleteTest.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
index 0fed77cc481f..c9ae2e30c292 100644
--- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
+++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
@@ -330,7 +330,7 @@ public class ForwardDeleteTest extends KeyListenerTestCase {
// ZERO WIDTH JOINER + regional indicator symbol
state.setByString("| U+1F469 U+200D U+1F1FA");
forwardDelete(state, 0);
- state.assertEquals("| U+1F1FA");
+ state.assertEquals("|");
// Regional indicator symbol + end with ZERO WIDTH JOINER
state.setByString("| U+1F1FA U+200D");
@@ -340,8 +340,6 @@ public class ForwardDeleteTest extends KeyListenerTestCase {
// Regional indicator symbol + ZERO WIDTH JOINER
state.setByString("| U+1F1FA U+200D U+1F469");
forwardDelete(state, 0);
- state.assertEquals("| U+1F469");
- forwardDelete(state, 0);
state.assertEquals("|");
// Start with ZERO WIDTH JOINER + emoji modifier
@@ -352,7 +350,7 @@ public class ForwardDeleteTest extends KeyListenerTestCase {
// ZERO WIDTH JOINER + emoji modifier
state.setByString("| U+1F469 U+200D U+1F3FB");
forwardDelete(state, 0);
- state.assertEquals("| U+1F3FB");
+ state.assertEquals("|");
// Emoji modifier + end with ZERO WIDTH JOINER
state.setByString("| U+1F466 U+1F3FB U+200D");
@@ -362,8 +360,6 @@ public class ForwardDeleteTest extends KeyListenerTestCase {
// Emoji modifier + ZERO WIDTH JOINER
state.setByString("| U+1F466 U+1F3FB U+200D U+1F469");
forwardDelete(state, 0);
- state.assertEquals("| U+1F469");
- forwardDelete(state, 0);
state.assertEquals("|");
// Regional indicator symbol + emoji modifier