From 1e22227117f6ad86e9efe2a2ca2cca1fc456f07e Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Thu, 30 Jun 2016 15:08:14 +0900 Subject: Update test expectations. After Ie49b378250, all emoji can be a part of ZWJ sequence, so need to update the test expectations. Bug: 29871956 Change-Id: I89ee3e432b6855c86df187cd36c78e9a4e275b79 --- .../coretests/src/android/text/method/ForwardDeleteTest.java | 8 ++------ 1 file 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 -- cgit v1.2.3-59-g8ed1b