Fix Test_org_eclipse_swt_custom_StyledTextContent

This test had bitrotten significantly since it was written a long
time ago. This commit fixes the behaviour by making test implementation
of StyledTextContent behave reasonably so that other StyledText
operations can complete successfully.

Author: jonahgraham

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java

@@ -34,7 +34,7 @@
 		Test_org_eclipse_swt_custom_LineStyleListener.class, //
 		Test_org_eclipse_swt_custom_StyleRange.class, //
 		Test_org_eclipse_swt_custom_StyledText.class, //
-		// Failing test: Test_org_eclipse_swt_custom_StyledTextContent.class, //
+		Test_org_eclipse_swt_custom_StyledTextContent.class, //
 		Test_org_eclipse_swt_custom_StyledTextLineSpacingProvider.class, //
 		Test_org_eclipse_swt_custom_StyledText_VariableLineHeight.class, //
 		Test_org_eclipse_swt_custom_StyledText_multiCaretsSelections.class, //

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextContent.java

@@ -33,29 +33,29 @@
  * @see org.eclipse.swt.custom.StyledTextContent
  */
 public class Test_org_eclipse_swt_custom_StyledTextContent {
-	int XINSET = 0;
+	private static final String INITIAL_TEXT = "initial text";
 
 	static class ContentImplementation implements StyledTextContent {
-		String textContent = "";
+		String textContent = INITIAL_TEXT;
 
 		@Override
 		public void addTextChangeListener(TextChangeListener listener){
 		}
 		@Override
 		public int getCharCount() {
-			return 0;
+			return textContent.length();
 		}
 		@Override
 		public String getLine(int lineIndex) {
-			return "getLine";
+			return textContent;
 		}
 		@Override
 		public int getLineAtOffset(int offset) {
 			return 0;
 		}
 		@Override
 		public int getLineCount() {
-			return 0;
+			return 1;
 		}
 		@Override
 		public String getLineDelimiter() {
@@ -67,14 +67,14 @@ public int getOffsetAtLine(int lineIndex) {
 		}
 		@Override
 		public String getTextRange(int start, int length) {
-			return textContent;
+			return textContent.substring(start, start + length);
 		}
 		@Override
 		public void removeTextChangeListener(TextChangeListener listener) {
 		}
 		@Override
 		public void replaceTextRange(int start, int replaceLength, String text) {
-			textContent = text;
+			textContent = textContent.substring(0, start) +text + textContent.substring(start + replaceLength);
 		}
 		@Override
 		public void setText(String text) {
@@ -87,16 +87,14 @@ public void setText(String text) {
 
 @Before
 public void setUp() {
-	if (SwtTestUtil.isBidi()) XINSET = 2;
-	else XINSET = 0;
 	shell = new Shell();
 	styledText = new StyledText(shell, SWT.NULL);
 	styledText.setContent(content);
 }
 
 @Test
 public void test_getCharCount() {
-	assertEquals(":a:", 0, styledText.getCharCount());
+	assertEquals(":a:", INITIAL_TEXT.length(), styledText.getCharCount());
 }
 
 @Test
@@ -117,13 +115,13 @@ public void test_getLineDelimiter() {
 @Test
 public void test_getLineI() {
 	// will indirectly cause getLine to be called
-	assertEquals(":b:", new Point(XINSET,0), styledText.getLocationAtOffset(0));
+	assertEquals(":b:", new Point(0,0), styledText.getLocationAtOffset(0));
 }
 
 @Test
 public void test_getOffsetAtLineI() {
 	// will indirectly cause getOffsetAtLine to be called
-	assertEquals(":f:", new Point(XINSET,0), styledText.getLocationAtOffset(0));
+	assertEquals(":f:", new Point(0,0), styledText.getLocationAtOffset(0));
 }
 
 @Test
@@ -134,13 +132,13 @@ public void test_getTextRangeII() {
 @Test
 public void test_replaceTextRangeIILjava_lang_String() {
 	styledText.replaceTextRange(0,0,"test1");
-	assertEquals(":h:", "test1", styledText.getText());
+	assertEquals(":h:", "test1" + INITIAL_TEXT, styledText.getText());
 }
 
 @Test
 public void test_setTextLjava_lang_String() {
 	styledText.replaceTextRange(0,0,"test2");
-	assertEquals(":i:", "test2", styledText.getText());
+	assertEquals(":i:", "test2" + INITIAL_TEXT, styledText.getText());
 }
 
 }