Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e222271 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

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
parent 00888522

core/tests/coretests/src/android/text/method/ForwardDeleteTest.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -330,7 +330,7 @@ public class ForwardDeleteTest extends KeyListenerTestCase { 
        // ZERO WIDTH JOINER + regional indicator symbol

        // ZERO WIDTH JOINER + regional indicator symbol

        state.setByString("| U+1F469 U+200D U+1F1FA");

        state.setByString("| U+1F469 U+200D U+1F1FA");

        forwardDelete(state, 0);

        forwardDelete(state, 0);

        state.assertEquals("| U+1F1FA");

        state.assertEquals("|");





        // Regional indicator symbol + end with ZERO WIDTH JOINER

        // Regional indicator symbol + end with ZERO WIDTH JOINER

        state.setByString("| U+1F1FA U+200D");

        state.setByString("| U+1F1FA U+200D");
@@ -340,8 +340,6 @@ public class ForwardDeleteTest extends KeyListenerTestCase { 
        // Regional indicator symbol + ZERO WIDTH JOINER

        // Regional indicator symbol + ZERO WIDTH JOINER

        state.setByString("| U+1F1FA U+200D U+1F469");

        state.setByString("| U+1F1FA U+200D U+1F469");

        forwardDelete(state, 0);

        forwardDelete(state, 0);

        state.assertEquals("| U+1F469");

        forwardDelete(state, 0);

        state.assertEquals("|");

        state.assertEquals("|");





        // Start with ZERO WIDTH JOINER + emoji modifier

        // Start with ZERO WIDTH JOINER + emoji modifier
@@ -352,7 +350,7 @@ public class ForwardDeleteTest extends KeyListenerTestCase { 
        // ZERO WIDTH JOINER + emoji modifier

        // ZERO WIDTH JOINER + emoji modifier

        state.setByString("| U+1F469 U+200D U+1F3FB");

        state.setByString("| U+1F469 U+200D U+1F3FB");

        forwardDelete(state, 0);

        forwardDelete(state, 0);

        state.assertEquals("| U+1F3FB");

        state.assertEquals("|");





        // Emoji modifier + end with ZERO WIDTH JOINER

        // Emoji modifier + end with ZERO WIDTH JOINER

        state.setByString("| U+1F466 U+1F3FB U+200D");

        state.setByString("| U+1F466 U+1F3FB U+200D");
@@ -362,8 +360,6 @@ public class ForwardDeleteTest extends KeyListenerTestCase { 
        // Emoji modifier + ZERO WIDTH JOINER

        // Emoji modifier + ZERO WIDTH JOINER

        state.setByString("| U+1F466 U+1F3FB U+200D U+1F469");

        state.setByString("| U+1F466 U+1F3FB U+200D U+1F469");

        forwardDelete(state, 0);

        forwardDelete(state, 0);

        state.assertEquals("| U+1F469");

        forwardDelete(state, 0);

        state.assertEquals("|");

        state.assertEquals("|");





        // Regional indicator symbol + emoji modifier

        // Regional indicator symbol + emoji modifier