Merge "Update test expectations." (9324764e) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -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