*** empty log message ***

1 files changed, 392 insertions, 392 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java
index 01cc943d13..834e7aa19d 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java
@@ -40,7 +40,7 @@ public class StyledTextContentSpec implements TextChangeListener {
 	

 public StyledTextContentSpec() {

 }

-public void assert(String message, boolean condition) {

+public void assertTrue(String message, boolean condition) {

 	System.out.print("\t" + currentMethod.getName() + " " + message);

 	if (!condition) 

 		fail(message);

@@ -49,7 +49,7 @@ public void assert(String message, boolean condition) {
 }

 public void fail(String message) {

 	failed = true;

-	System.out.println(" FAILED");

+	System.out.println(" FAILED: " + message);

 	failCount++;

 }

 public StyledTextContent getContentInstance() {

@@ -163,91 +163,91 @@ public void textChanged(TextChangedEvent event) {
 public void textChanging(TextChangingEvent event) {

 	switch (verify) {

 		case 1 : {

-			assert(":1a:", event.replaceLineCount == 0);

-			assert(":1b:", event.newLineCount == 1);

+			assertTrue(":1a:", event.replaceLineCount == 0);

+			assertTrue(":1b:", event.newLineCount == 1);

 			break;

 		}

 		case 2 : {

-			assert(":2a:", event.replaceLineCount == 2);

-			assert(":2b:", event.newLineCount == 0);

+			assertTrue(":2a:", event.replaceLineCount == 2);

+			assertTrue(":2b:", event.newLineCount == 0);

 			break;

 		}

 		case 3 : {

-			assert(":3a:", event.replaceLineCount == 0);

-			assert(":3b:", event.newLineCount == 2);

+			assertTrue(":3a:", event.replaceLineCount == 0);

+			assertTrue(":3b:", event.newLineCount == 2);

 			break;

 		}

 		case 4: {

-			assert(":4:", false);

+			assertTrue(":4:", false);

 			break;

 		}

 		case 5 : {

-			assert(":5a:", event.replaceLineCount == 0);

-			assert(":5b:", event.newLineCount == 1);

+			assertTrue(":5a:", event.replaceLineCount == 0);

+			assertTrue(":5b:", event.newLineCount == 1);

 			break;

 		}

 		case 6 : {

-			assert(":6a:", event.replaceLineCount == 1);

-			assert(":6b:", event.newLineCount == 0);

+			assertTrue(":6a:", event.replaceLineCount == 1);

+			assertTrue(":6b:", event.newLineCount == 0);

 			break;

 		}

 		case 8 : {

-			assert(":8a:", event.replaceLineCount == 1);

-			assert(":8b:", event.newLineCount == 0);

+			assertTrue(":8a:", event.replaceLineCount == 1);

+			assertTrue(":8b:", event.newLineCount == 0);

 			break;

 		}

 		case 9 : {

-			assert(":9a:", event.replaceLineCount == 1);

-			assert(":9b:", event.newLineCount == 0);

+			assertTrue(":9a:", event.replaceLineCount == 1);

+			assertTrue(":9b:", event.newLineCount == 0);

 			break;

 		}

 		case 10:{

-			assert(":10:", false);

+			assertTrue(":10:", false);

 			break;

 		}

 		case 11: {

-			assert(":11:", false);

+			assertTrue(":11:", false);

 			break;

 		}

 		case 12: {

-			assert(":12a:", event.replaceLineCount == 0);

-			assert(":12b:", event.newLineCount == 1);

+			assertTrue(":12a:", event.replaceLineCount == 0);

+			assertTrue(":12b:", event.newLineCount == 1);

 			break;

 		}

 		case 13: {

-			assert(":13a:", event.replaceLineCount == 0);

-			assert(":13b:", event.newLineCount == 1);

+			assertTrue(":13a:", event.replaceLineCount == 0);

+			assertTrue(":13b:", event.newLineCount == 1);

 			break;

 		}

 		case 14: {

-			assert(":14:", false);

+			assertTrue(":14:", false);

 			break;

 		}

 		case 15: {

-			assert(":15a:", event.replaceLineCount == 1);

-			assert(":15b:", event.newLineCount == 2);

+			assertTrue(":15a:", event.replaceLineCount == 1);

+			assertTrue(":15b:", event.newLineCount == 2);

 			break;

 		}

 		case 16:{

-			assert(":16:", false);

+			assertTrue(":16:", false);

 			break;

 		}

 		case 17: {

-			assert(":17:", false);

+			assertTrue(":17:", false);

 			break;

 		}

 		case 18: {

-			assert(":18a:", event.replaceLineCount == 0);

-			assert(":18b:", event.newLineCount == 2);

+			assertTrue(":18a:", event.replaceLineCount == 0);

+			assertTrue(":18b:", event.newLineCount == 2);

 			break;

 		}

 		case 19: {

-			assert(":19a:", event.replaceLineCount == 0);

-			assert(":19b:", event.newLineCount == 3);

+			assertTrue(":19a:", event.replaceLineCount == 0);

+			assertTrue(":19b:", event.newLineCount == 3);

 			break;

 		}

 		case 20: {

-			assert(":20:", false);

+			assertTrue(":20:", false);

 			break;

 		}

 	}

@@ -259,315 +259,315 @@ public void test_Insert() {
 	content.setText("This\nis a test\r");

 	content.replaceTextRange(0, 0, "test\n ");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":1a:", newText.equals("test\n This\nis a test\r"));

-	assert(":1b:", content.getLineCount() == 4);

-	assert(":1c:", content.getLine(0).equals("test"));

-	assert(":1d:", content.getLine(1).equals(" This"));

-	assert(":1e:", content.getLine(2).equals("is a test"));

-	assert(":1f:", content.getLine(3).equals(""));

+	assertTrue(":1a:", newText.equals("test\n This\nis a test\r"));

+	assertTrue(":1b:", content.getLineCount() == 4);

+	assertTrue(":1c:", content.getLine(0).equals("test"));

+	assertTrue(":1d:", content.getLine(1).equals(" This"));

+	assertTrue(":1e:", content.getLine(2).equals("is a test"));

+	assertTrue(":1f:", content.getLine(3).equals(""));

 


 	content.setText("This\nis a test\r");

 	content.replaceTextRange(5, 0, "*** ");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":2a:", newText.equals("This\n*** is a test\r"));

-	assert(":2b:", content.getLineCount() == 3);

-	assert(":2c:", content.getLine(0).equals("This"));

-	assert(":2d:", content.getLine(1).equals("*** is a test"));

-	assert(":2e:", content.getLine(2).equals(""));

+	assertTrue(":2a:", newText.equals("This\n*** is a test\r"));

+	assertTrue(":2b:", content.getLineCount() == 3);

+	assertTrue(":2c:", content.getLine(0).equals("This"));

+	assertTrue(":2d:", content.getLine(1).equals("*** is a test"));

+	assertTrue(":2e:", content.getLine(2).equals(""));

 


 	content.setText("Line 1\r\nLine 2");

 	content.replaceTextRange(0, 0, "\r");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3a:", newText.equals("\rLine 1\r\nLine 2"));

-	assert(":3b:", content.getLineCount() == 3);

-	assert(":3c:", content.getLine(0).equals(""));

-	assert(":3d:", content.getLine(1).equals("Line 1"));

-	assert(":3e:", content.getLine(2).equals("Line 2"));

+	assertTrue(":3a:", newText.equals("\rLine 1\r\nLine 2"));

+	assertTrue(":3b:", content.getLineCount() == 3);

+	assertTrue(":3c:", content.getLine(0).equals(""));

+	assertTrue(":3d:", content.getLine(1).equals("Line 1"));

+	assertTrue(":3e:", content.getLine(2).equals("Line 2"));

 	content.replaceTextRange(9, 0, "\r");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));

-	assert(":3g:", content.getLineCount() == 4);

-	assert(":3h:", content.getLine(0).equals(""));

-	assert(":3i:", content.getLine(1).equals("Line 1"));

-	assert(":3j:", content.getLine(2).equals(""));

-	assert(":3k:", content.getLine(3).equals("Line 2"));

+	assertTrue(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));

+	assertTrue(":3g:", content.getLineCount() == 4);

+	assertTrue(":3h:", content.getLine(0).equals(""));

+	assertTrue(":3i:", content.getLine(1).equals("Line 1"));

+	assertTrue(":3j:", content.getLine(2).equals(""));

+	assertTrue(":3k:", content.getLine(3).equals("Line 2"));

 


 	content.setText("This\nis a test\r");

 	content.replaceTextRange(0, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4a:", newText.equals("\nThis\nis a test\r"));

-	assert(":4b:", content.getLineCount() == 4);

-	assert(":4c:", content.getLine(0).equals(""));

-	assert(":4d:", content.getLine(1).equals("This"));

-	assert(":4e:", content.getLine(2).equals("is a test"));

-	assert(":4f:", content.getLine(3).equals(""));

+	assertTrue(":4a:", newText.equals("\nThis\nis a test\r"));

+	assertTrue(":4b:", content.getLineCount() == 4);

+	assertTrue(":4c:", content.getLine(0).equals(""));

+	assertTrue(":4d:", content.getLine(1).equals("This"));

+	assertTrue(":4e:", content.getLine(2).equals("is a test"));

+	assertTrue(":4f:", content.getLine(3).equals(""));

 	

 	content.setText("This\nis a test\r");

 	content.replaceTextRange(7, 0, "\r\nnewLine");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));

-	assert(":5b:", content.getLineCount() == 4);

-	assert(":5c:", content.getLine(0).equals("This"));

-	assert(":5d:", content.getLine(1).equals("is"));

-	assert(":5e:", content.getLine(2).equals("newLine a test"));

-	assert(":5f:", content.getLine(3).equals(""));

+	assertTrue(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));

+	assertTrue(":5b:", content.getLineCount() == 4);

+	assertTrue(":5c:", content.getLine(0).equals("This"));

+	assertTrue(":5d:", content.getLine(1).equals("is"));

+	assertTrue(":5e:", content.getLine(2).equals("newLine a test"));

+	assertTrue(":5f:", content.getLine(3).equals(""));

 


 	content.setText("");

 	content.replaceTextRange(0, 0, "This\nis\r\nnewLine a test\r");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));

-	assert(":6b:", content.getLineCount() == 4);

-	assert(":6c:", content.getLine(0).equals("This"));

-	assert(":6d:", content.getLine(1).equals("is"));

-	assert(":6e:", content.getLine(2).equals("newLine a test"));

-	assert(":6f:", content.getLine(3).equals(""));

+	assertTrue(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));

+	assertTrue(":6b:", content.getLineCount() == 4);

+	assertTrue(":6c:", content.getLine(0).equals("This"));

+	assertTrue(":6d:", content.getLine(1).equals("is"));

+	assertTrue(":6e:", content.getLine(2).equals("newLine a test"));

+	assertTrue(":6f:", content.getLine(3).equals(""));

 


 	// insert at end

 	content.setText("This");

 	content.replaceTextRange(4, 0, "\n ");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":7a:", newText.equals("This\n "));

-	assert(":7b:", content.getLineCount() == 2);

-	assert(":7c:", content.getLine(0).equals("This"));

-	assert(":7d:", content.getLine(1).equals(" "));

+	assertTrue(":7a:", newText.equals("This\n "));

+	assertTrue(":7b:", content.getLineCount() == 2);

+	assertTrue(":7c:", content.getLine(0).equals("This"));

+	assertTrue(":7d:", content.getLine(1).equals(" "));

 	content.setText("This\n");

 	content.replaceTextRange(5, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":7e:", newText.equals("This\n\n"));

-	assert(":7f:", content.getLineCount() == 3);

-	assert(":7g:", content.getLine(0).equals("This"));

-	assert(":7h:", content.getLine(1).equals(""));

-	assert(":7i:", content.getLine(2).equals(""));

+	assertTrue(":7e:", newText.equals("This\n\n"));

+	assertTrue(":7f:", content.getLineCount() == 3);

+	assertTrue(":7g:", content.getLine(0).equals("This"));

+	assertTrue(":7h:", content.getLine(1).equals(""));

+	assertTrue(":7i:", content.getLine(2).equals(""));

 


 	// insert at beginning

 	content.setText("This");

 	content.replaceTextRange(0, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":8a:", newText.equals("\nThis"));

-	assert(":8b:", content.getLineCount() == 2);

-	assert(":8c:", content.getLine(0).equals(""));

-	assert(":8d:", content.getLine(1).equals("This"));

+	assertTrue(":8a:", newText.equals("\nThis"));

+	assertTrue(":8b:", content.getLineCount() == 2);

+	assertTrue(":8c:", content.getLine(0).equals(""));

+	assertTrue(":8d:", content.getLine(1).equals("This"));

 


 	// insert text

 	content.setText("This\nis a test\r");

 	content.replaceTextRange(5, 0, "*** ");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":9a:", newText.equals("This\n*** is a test\r"));

-	assert(":9b:", content.getLineCount() == 3);

-	assert(":9c:", content.getLine(0).equals("This"));

-	assert(":9d:", content.getLine(1).equals("*** is a test"));

-	assert(":9e:", content.getLine(2).equals(""));

+	assertTrue(":9a:", newText.equals("This\n*** is a test\r"));

+	assertTrue(":9b:", content.getLineCount() == 3);

+	assertTrue(":9c:", content.getLine(0).equals("This"));

+	assertTrue(":9d:", content.getLine(1).equals("*** is a test"));

+	assertTrue(":9e:", content.getLine(2).equals(""));

 	

 	content.setText("This\n");

 	content.replaceTextRange(5, 0, "line");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":10a:", newText.equals("This\nline"));

-	assert(":10b:", content.getLineCount() == 2);

-	assert(":10c:", content.getLine(0).equals("This"));

-	assert(":10d:", content.getLine(1).equals("line"));

-	assert(":10e:", content.getLineAtOffset(8) == 1);

-	assert(":10f:", content.getLineAtOffset(9) == 1);

+	assertTrue(":10a:", newText.equals("This\nline"));

+	assertTrue(":10b:", content.getLineCount() == 2);

+	assertTrue(":10c:", content.getLine(0).equals("This"));

+	assertTrue(":10d:", content.getLine(1).equals("line"));

+	assertTrue(":10e:", content.getLineAtOffset(8) == 1);

+	assertTrue(":10f:", content.getLineAtOffset(9) == 1);

 


 	// insert at beginning 

 	content.setText("This\n");

 	content.replaceTextRange(0, 0, "line\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":11a:", newText.equals("line\nThis\n"));

-	assert(":11b:", content.getLineCount() == 3);

-	assert(":11c:", content.getLine(0).equals("line"));

-	assert(":11d:", content.getLine(1).equals("This"));

-	assert(":11e:", content.getLineAtOffset(5) == 1);

+	assertTrue(":11a:", newText.equals("line\nThis\n"));

+	assertTrue(":11b:", content.getLineCount() == 3);

+	assertTrue(":11c:", content.getLine(0).equals("line"));

+	assertTrue(":11d:", content.getLine(1).equals("This"));

+	assertTrue(":11e:", content.getLineAtOffset(5) == 1);

 


 	content.setText("Line 1\r\nLine 2\r\nLine 3");

 	content.replaceTextRange(0, 0, "\r");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));

-	assert(":12b:", content.getLineCount() == 4);

-	assert(":12c:", content.getLine(0).equals(""));

-	assert(":12d:", content.getLine(1).equals("Line 1"));

-	assert(":12e:", content.getLine(2).equals("Line 2"));

-	assert(":12f:", content.getLine(3).equals("Line 3"));

+	assertTrue(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));

+	assertTrue(":12b:", content.getLineCount() == 4);

+	assertTrue(":12c:", content.getLine(0).equals(""));

+	assertTrue(":12d:", content.getLine(1).equals("Line 1"));

+	assertTrue(":12e:", content.getLine(2).equals("Line 2"));

+	assertTrue(":12f:", content.getLine(3).equals("Line 3"));

 


 	content.setText("Line 1\nLine 2\nLine 3");

 	content.replaceTextRange(7, 0, "Line1a\nLine1b\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));

-	assert(":13b:", content.getLineCount() == 5);

-	assert(":13c:", content.getLine(0).equals("Line 1"));

-	assert(":13d:", content.getLine(1).equals("Line1a"));

-	assert(":13e:", content.getLine(2).equals("Line1b"));

-	assert(":13f:", content.getLine(3).equals("Line 2"));

-	assert(":13g:", content.getLine(4).equals("Line 3"));

+	assertTrue(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));

+	assertTrue(":13b:", content.getLineCount() == 5);

+	assertTrue(":13c:", content.getLine(0).equals("Line 1"));

+	assertTrue(":13d:", content.getLine(1).equals("Line1a"));

+	assertTrue(":13e:", content.getLine(2).equals("Line1b"));

+	assertTrue(":13f:", content.getLine(3).equals("Line 2"));

+	assertTrue(":13g:", content.getLine(4).equals("Line 3"));

 


 	content.setText("Line 1\nLine 2\nLine 3");

 	content.replaceTextRange(11, 0, "l1a");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));

-	assert(":14b:", content.getLineCount() == 3);

-	assert(":14c:", content.getLine(0).equals("Line 1"));

-	assert(":14d:", content.getLine(1).equals("Linel1a 2"));

-	assert(":14e:", content.getLine(2).equals("Line 3"));

+	assertTrue(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));

+	assertTrue(":14b:", content.getLineCount() == 3);

+	assertTrue(":14c:", content.getLine(0).equals("Line 1"));

+	assertTrue(":14d:", content.getLine(1).equals("Linel1a 2"));

+	assertTrue(":14e:", content.getLine(2).equals("Line 3"));

 


 	content.setText("Line 1\nLine 2 is a very long line that spans many words\nLine 3");

 	content.replaceTextRange(19, 0, "very, very, ");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));

-	assert(":15b:", content.getLineCount() == 3);

-	assert(":15c:", content.getLine(0).equals("Line 1"));

-	assert(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));

-	assert(":15e:", content.getLine(2).equals("Line 3"));

+	assertTrue(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));

+	assertTrue(":15b:", content.getLineCount() == 3);

+	assertTrue(":15c:", content.getLine(0).equals("Line 1"));

+	assertTrue(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));

+	assertTrue(":15e:", content.getLine(2).equals("Line 3"));

 }

 


 public void test_Empty() {

 	StyledTextContent content = getContentInstance();

-	assert(":1a:", content.getLineCount() == 1);

-	assert(":1b:", content.getLine(0).equals(""));

+	assertTrue(":1a:", content.getLineCount() == 1);

+	assertTrue(":1b:", content.getLine(0).equals(""));

 


 	content.setText("test");

 	content.replaceTextRange(0,4,"");

-	assert(":2a:", content.getLineCount() == 1);

-	assert(":2b:", content.getLine(0).equals(""));

+	assertTrue(":2a:", content.getLineCount() == 1);

+	assertTrue(":2b:", content.getLine(0).equals(""));

 }

 public void test_Line_Conversion() {

 	StyledTextContent content = getContentInstance();

 	

 	content.setText("This\nis a test\rrepeat\nend\r");

-	assert(":1a:", content.getLineCount() == 5);	

-	assert(":1b:", content.getLine(0).equals("This"));

-	assert(":1c:", content.getOffsetAtLine(0) == 0);	

-	assert(":1d:", content.getLine(1).equals("is a test"));

-	assert(":1e:", content.getLineAtOffset(4) == 0);

-	assert(":1f:", content.getOffsetAtLine(1) == 5);	

-	assert(":1g:", content.getLine(2).equals("repeat"));

-	assert(":1h:", content.getOffsetAtLine(2) == 15);	

-	assert(":1i:", content.getLine(3).equals("end"));

-	assert(":1j:", content.getOffsetAtLine(3) == 22);

-	assert(":1k:", content.getLine(4).equals(""));

-	assert(":1l:", content.getOffsetAtLine(4) == 26);

+	assertTrue(":1a:", content.getLineCount() == 5);	

+	assertTrue(":1b:", content.getLine(0).equals("This"));

+	assertTrue(":1c:", content.getOffsetAtLine(0) == 0);	

+	assertTrue(":1d:", content.getLine(1).equals("is a test"));

+	assertTrue(":1e:", content.getLineAtOffset(4) == 0);

+	assertTrue(":1f:", content.getOffsetAtLine(1) == 5);	

+	assertTrue(":1g:", content.getLine(2).equals("repeat"));

+	assertTrue(":1h:", content.getOffsetAtLine(2) == 15);	

+	assertTrue(":1i:", content.getLine(3).equals("end"));

+	assertTrue(":1j:", content.getOffsetAtLine(3) == 22);

+	assertTrue(":1k:", content.getLine(4).equals(""));

+	assertTrue(":1l:", content.getOffsetAtLine(4) == 26);

 	

 	content.setText("This\r\nis a test");

-	assert(":2a:", content.getLineCount() == 2);

-	assert(":2b:", content.getLine(1).equals("is a test"));

-	assert(":2c:", content.getLineAtOffset(4) == 0);

-	assert(":2d:", content.getLineAtOffset(5) == 0);

+	assertTrue(":2a:", content.getLineCount() == 2);

+	assertTrue(":2b:", content.getLine(1).equals("is a test"));

+	assertTrue(":2c:", content.getLineAtOffset(4) == 0);

+	assertTrue(":2d:", content.getLineAtOffset(5) == 0);

 


 	content.setText("This\r\nis a test\r");

-	assert(":3a:", content.getLineCount() == 3);

-	assert(":3b:", content.getLine(1).equals("is a test"));

-	assert(":3c:", content.getLineAtOffset(15) == 1);

+	assertTrue(":3a:", content.getLineCount() == 3);

+	assertTrue(":3b:", content.getLine(1).equals("is a test"));

+	assertTrue(":3c:", content.getLineAtOffset(15) == 1);

 	

 	content.setText("\r\n");

-	assert(":4a:", content.getLineCount() == 2);

-	assert(":4b:", content.getLine(0).equals(""));

-	assert(":4c:", content.getLine(1).equals(""));

-	assert(":4d:", content.getLineAtOffset(0) == 0);

-	assert(":4e:", content.getLineAtOffset(1) == 0);

-	assert(":4f:", content.getLineAtOffset(2) == 1);

+	assertTrue(":4a:", content.getLineCount() == 2);

+	assertTrue(":4b:", content.getLine(0).equals(""));

+	assertTrue(":4c:", content.getLine(1).equals(""));

+	assertTrue(":4d:", content.getLineAtOffset(0) == 0);

+	assertTrue(":4e:", content.getLineAtOffset(1) == 0);

+	assertTrue(":4f:", content.getLineAtOffset(2) == 1);

 


 	content.setText("\r\n\n\r\r\n");

-	assert(":5a:", content.getLineCount() == 5);

-	assert(":5b:", content.getLine(0).equals(""));

-	assert(":5c:", content.getOffsetAtLine(0) == 0);	

-	assert(":5d:", content.getLine(1).equals(""));

-	assert(":5e:", content.getOffsetAtLine(1) == 2);	

-	assert(":5f:", content.getLine(2).equals(""));

-	assert(":5g:", content.getOffsetAtLine(2) == 3);	

-	assert(":5h:", content.getLine(3).equals(""));

-	assert(":5i:", content.getOffsetAtLine(3) == 4);

-	assert(":5j:", content.getLine(4).equals(""));

-	assert(":5k:", content.getOffsetAtLine(4) == 6);

+	assertTrue(":5a:", content.getLineCount() == 5);

+	assertTrue(":5b:", content.getLine(0).equals(""));

+	assertTrue(":5c:", content.getOffsetAtLine(0) == 0);	

+	assertTrue(":5d:", content.getLine(1).equals(""));

+	assertTrue(":5e:", content.getOffsetAtLine(1) == 2);	

+	assertTrue(":5f:", content.getLine(2).equals(""));

+	assertTrue(":5g:", content.getOffsetAtLine(2) == 3);	

+	assertTrue(":5h:", content.getLine(3).equals(""));

+	assertTrue(":5i:", content.getOffsetAtLine(3) == 4);

+	assertTrue(":5j:", content.getLine(4).equals(""));

+	assertTrue(":5k:", content.getOffsetAtLine(4) == 6);

 	

 	content.setText("test\r\rtest2\r\r");

-	assert(":6a:", content.getLineCount() == 5);

-	assert(":6b:", content.getLine(0).equals("test"));

-	assert(":6c:", content.getOffsetAtLine(0) == 0);

-	assert(":6d:", content.getLine(1).equals(""));

-	assert(":6e:", content.getOffsetAtLine(1) == 5);	

-	assert(":6f:", content.getLine(2).equals("test2"));

-	assert(":6g:", content.getOffsetAtLine(2) == 6);	

-	assert(":6h:", content.getLine(3).equals(""));

-	assert(":6i:", content.getOffsetAtLine(3) == 12);

-	assert(":6j:", content.getLine(4).equals(""));

-	assert(":6k:", content.getOffsetAtLine(4) == 13);

+	assertTrue(":6a:", content.getLineCount() == 5);

+	assertTrue(":6b:", content.getLine(0).equals("test"));

+	assertTrue(":6c:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":6d:", content.getLine(1).equals(""));

+	assertTrue(":6e:", content.getOffsetAtLine(1) == 5);	

+	assertTrue(":6f:", content.getLine(2).equals("test2"));

+	assertTrue(":6g:", content.getOffsetAtLine(2) == 6);	

+	assertTrue(":6h:", content.getLine(3).equals(""));

+	assertTrue(":6i:", content.getOffsetAtLine(3) == 12);

+	assertTrue(":6j:", content.getLine(4).equals(""));

+	assertTrue(":6k:", content.getOffsetAtLine(4) == 13);

 }

 public void test_Offset_To_Line() {

 	StyledTextContent content = getContentInstance();

 	

 	content.setText("This\nis a test\rrepeat\nend\r");

-	assert(":1a:", content.getLineAtOffset(0) == 0);

-	assert(":1b:", content.getLineAtOffset(3) == 0);

-	assert(":1c:", content.getLineAtOffset(4) == 0);

-	assert(":1d:", content.getLineAtOffset(25) == 3);

-	assert(":1e:", content.getLineAtOffset(26) == 4);

+	assertTrue(":1a:", content.getLineAtOffset(0) == 0);

+	assertTrue(":1b:", content.getLineAtOffset(3) == 0);

+	assertTrue(":1c:", content.getLineAtOffset(4) == 0);

+	assertTrue(":1d:", content.getLineAtOffset(25) == 3);

+	assertTrue(":1e:", content.getLineAtOffset(26) == 4);

 	

 	content.setText("This\r\nis a test");

-	assert(":2a:", content.getLineAtOffset(5) == 0);

-	assert(":2b:", content.getLineAtOffset(6) == 1);

-	assert(":2c:", content.getLineAtOffset(10) == 1);

+	assertTrue(":2a:", content.getLineAtOffset(5) == 0);

+	assertTrue(":2b:", content.getLineAtOffset(6) == 1);

+	assertTrue(":2c:", content.getLineAtOffset(10) == 1);

 	

 	content.setText("\r\n");

-	assert(":3a:", content.getLineAtOffset(0) == 0);

-	assert(":3b:", content.getLineAtOffset(1) == 0);

-	assert(":3c:", content.getLineAtOffset(2) == 1);

+	assertTrue(":3a:", content.getLineAtOffset(0) == 0);

+	assertTrue(":3b:", content.getLineAtOffset(1) == 0);

+	assertTrue(":3c:", content.getLineAtOffset(2) == 1);

 


 	content.setText("\r\n\n\r\r\n");

-	assert(":4a:", content.getLineAtOffset(0) == 0);

-	assert(":4b:", content.getLineAtOffset(1) == 0);

-	assert(":4c:", content.getLineAtOffset(2) == 1);

-	assert(":4d:", content.getLineAtOffset(3) == 2);

-	assert(":4e:", content.getLineAtOffset(4) == 3);

-	assert(":4f:", content.getLineAtOffset(5) == 3);

-	assert(":4g:", content.getLineAtOffset(6) == 4);

+	assertTrue(":4a:", content.getLineAtOffset(0) == 0);

+	assertTrue(":4b:", content.getLineAtOffset(1) == 0);

+	assertTrue(":4c:", content.getLineAtOffset(2) == 1);

+	assertTrue(":4d:", content.getLineAtOffset(3) == 2);

+	assertTrue(":4e:", content.getLineAtOffset(4) == 3);

+	assertTrue(":4f:", content.getLineAtOffset(5) == 3);

+	assertTrue(":4g:", content.getLineAtOffset(6) == 4);

 


 	content.setText("\r\n\r\n");

-	assert(":5a:", content.getLineAtOffset(0) == 0);

-	assert(":5b:", content.getLineAtOffset(1) == 0);

-	assert(":5c:", content.getLineAtOffset(2) == 1);

-	assert(":5d:", content.getLineAtOffset(3) == 1);

-	assert(":5e:", content.getLineAtOffset(4) == 2);

+	assertTrue(":5a:", content.getLineAtOffset(0) == 0);

+	assertTrue(":5b:", content.getLineAtOffset(1) == 0);

+	assertTrue(":5c:", content.getLineAtOffset(2) == 1);

+	assertTrue(":5d:", content.getLineAtOffset(3) == 1);

+	assertTrue(":5e:", content.getLineAtOffset(4) == 2);

 


 	content.setText("\r\r\r\n\r\n");

-	assert(":6a:", content.getLineAtOffset(0) == 0);

-	assert(":6b:", content.getLineAtOffset(1) == 1);

-	assert(":6c:", content.getLineAtOffset(2) == 2);

-	assert(":6d:", content.getLineAtOffset(4) == 3);

+	assertTrue(":6a:", content.getLineAtOffset(0) == 0);

+	assertTrue(":6b:", content.getLineAtOffset(1) == 1);

+	assertTrue(":6c:", content.getLineAtOffset(2) == 2);

+	assertTrue(":6d:", content.getLineAtOffset(4) == 3);

 	

 	content.setText("");

-	assert(":7a:", content.getLineAtOffset(0) == 0);

+	assertTrue(":7a:", content.getLineAtOffset(0) == 0);

 	

 	content = getContentInstance();

-	assert(":8a:", content.getLineAtOffset(0) == 0);	

+	assertTrue(":8a:", content.getLineAtOffset(0) == 0);	

 }

 


 public void test_Line_To_Offset() {

 	StyledTextContent content = getContentInstance();

 	

 	content.setText("This\nis a test\rrepeat\nend\r");

-	assert(":1a:", content.getOffsetAtLine(0) == 0);

-	assert(":1b:", content.getOffsetAtLine(1) == 5);

-	assert(":1c:", content.getOffsetAtLine(2) == 15);

-	assert(":1d:", content.getOffsetAtLine(3) == 22);

-	assert(":1e:", content.getOffsetAtLine(4) == 26);

+	assertTrue(":1a:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":1b:", content.getOffsetAtLine(1) == 5);

+	assertTrue(":1c:", content.getOffsetAtLine(2) == 15);

+	assertTrue(":1d:", content.getOffsetAtLine(3) == 22);

+	assertTrue(":1e:", content.getOffsetAtLine(4) == 26);

 	

 	content.setText("This\r\nis a test");

-	assert(":2a:", content.getOffsetAtLine(0) == 0);

-	assert(":2b:", content.getOffsetAtLine(1) == 6);

+	assertTrue(":2a:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":2b:", content.getOffsetAtLine(1) == 6);

 	

 	content.setText("\r\n");

-	assert(":3a:", content.getOffsetAtLine(0) == 0);

-	assert(":3b:", content.getOffsetAtLine(1) == 2);

+	assertTrue(":3a:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":3b:", content.getOffsetAtLine(1) == 2);

 


 	content.setText("\r\n\n\r\r\n");

-	assert(":4a:", content.getOffsetAtLine(0) == 0);

-	assert(":4b:", content.getOffsetAtLine(1) == 2);

-	assert(":4c:", content.getOffsetAtLine(2) == 3);

-	assert(":4d:", content.getOffsetAtLine(3) == 4);

-	assert(":4e:", content.getOffsetAtLine(4) == 6);

+	assertTrue(":4a:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":4b:", content.getOffsetAtLine(1) == 2);

+	assertTrue(":4c:", content.getOffsetAtLine(2) == 3);

+	assertTrue(":4d:", content.getOffsetAtLine(3) == 4);

+	assertTrue(":4e:", content.getOffsetAtLine(4) == 6);

 


 	content.setText("\r\ntest\r\n");

-	assert(":5a:", content.getOffsetAtLine(0) == 0);

-	assert(":5b:", content.getOffsetAtLine(1) == 2);

-	assert(":5c:", content.getOffsetAtLine(2) == 8);

+	assertTrue(":5a:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":5b:", content.getOffsetAtLine(1) == 2);

+	assertTrue(":5c:", content.getOffsetAtLine(2) == 8);

 }

 


 public void test_Delete() {

@@ -577,113 +577,113 @@ public void test_Delete() {
 	content.setText("This\nis a test\r");

 	content.replaceTextRange(6, 2, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":1a:", newText.equals("This\nia test\r"));

-	assert(":1b:", content.getLine(0).equals("This"));

-	assert(":1c:", content.getLine(1).equals("ia test"));

+	assertTrue(":1a:", newText.equals("This\nia test\r"));

+	assertTrue(":1b:", content.getLine(0).equals("This"));

+	assertTrue(":1c:", content.getLine(1).equals("ia test"));

 	

 	content.setText("This\nis a test\r");

 	content.replaceTextRange(5, 9, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":2a:", newText.equals("This\n\r"));

-	assert(":2b:",content.getLineCount() == 3);

-	assert(":2c:", content.getLine(0).equals("This"));

-	assert(":2d:", content.getLine(1).equals(""));

-	assert(":2e:", content.getLine(2).equals(""));

+	assertTrue(":2a:", newText.equals("This\n\r"));

+	assertTrue(":2b:",content.getLineCount() == 3);

+	assertTrue(":2c:", content.getLine(0).equals("This"));

+	assertTrue(":2d:", content.getLine(1).equals(""));

+	assertTrue(":2e:", content.getLine(2).equals(""));

 	

 	content.setText("This\nis a test\nline 3\nline 4");

 	content.replaceTextRange(21, 7, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3a:", newText.equals("This\nis a test\nline 3"));

-	assert(":3b:", content.getLineCount() == 3);

-	assert(":3c:", content.getLine(0).equals("This"));

-	assert(":3d:", content.getLine(1).equals("is a test"));

-	assert(":3e:", content.getLine(2).equals("line 3"));

+	assertTrue(":3a:", newText.equals("This\nis a test\nline 3"));

+	assertTrue(":3b:", content.getLineCount() == 3);

+	assertTrue(":3c:", content.getLine(0).equals("This"));

+	assertTrue(":3d:", content.getLine(1).equals("is a test"));

+	assertTrue(":3e:", content.getLine(2).equals("line 3"));

 	

 	content.setText("This\nis a test\nline 3\nline 4");

 	content.replaceTextRange(0, 5, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4a:", newText.equals("is a test\nline 3\nline 4"));

-	assert(":4b:", content.getLineCount() == 3);

-	assert(":4c:", content.getLine(0).equals("is a test"));

-	assert(":4d:", content.getLine(1).equals("line 3"));

-	assert(":4e:", content.getLine(2).equals("line 4"));

+	assertTrue(":4a:", newText.equals("is a test\nline 3\nline 4"));

+	assertTrue(":4b:", content.getLineCount() == 3);

+	assertTrue(":4c:", content.getLine(0).equals("is a test"));

+	assertTrue(":4d:", content.getLine(1).equals("line 3"));

+	assertTrue(":4e:", content.getLine(2).equals("line 4"));

 	content.replaceTextRange(16, 7, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4f:", newText.equals("is a test\nline 3"));

-	assert(":4g:", content.getLine(0).equals("is a test"));

-	assert(":4h:", content.getLine(1).equals("line 3"));

+	assertTrue(":4f:", newText.equals("is a test\nline 3"));

+	assertTrue(":4g:", content.getLine(0).equals("is a test"));

+	assertTrue(":4h:", content.getLine(1).equals("line 3"));

 	content.replaceTextRange(9, 7, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4i:", newText.equals("is a test"));

-	assert(":4j:", content.getLine(0).equals("is a test"));

+	assertTrue(":4i:", newText.equals("is a test"));

+	assertTrue(":4j:", content.getLine(0).equals("is a test"));

 	content.replaceTextRange(1, 8, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4k:", newText.equals("i"));

-	assert(":4l:", content.getLine(0).equals("i"));

+	assertTrue(":4k:", newText.equals("i"));

+	assertTrue(":4l:", content.getLine(0).equals("i"));

 	content.replaceTextRange(0, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4m:", newText.equals(""));

-	assert(":4n:", content.getLine(0).equals(""));

+	assertTrue(":4m:", newText.equals(""));

+	assertTrue(":4n:", content.getLine(0).equals(""));

 


 	content.setText("This\nis a test\r");

 	content.replaceTextRange(5, 9, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":5a:", newText.equals("This\n\r"));

-	assert(":5b:",content.getLineCount() == 3);

-	assert(":5c:", content.getLine(0).equals("This"));

-	assert(":5d:", content.getLine(1).equals(""));

-	assert(":5e:", content.getLine(2).equals(""));

+	assertTrue(":5a:", newText.equals("This\n\r"));

+	assertTrue(":5b:",content.getLineCount() == 3);

+	assertTrue(":5c:", content.getLine(0).equals("This"));

+	assertTrue(":5d:", content.getLine(1).equals(""));

+	assertTrue(":5e:", content.getLine(2).equals(""));

 


 	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");

 	content.replaceTextRange(4, 8, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6a:", newText.equals("L1\r\nL4\r\n"));

-	assert(":6b:",content.getLineCount() == 3);

-	assert(":6c:", content.getLine(0).equals("L1"));

-	assert(":6d:", content.getLine(1).equals("L4"));

-	assert(":6e:", content.getLine(2).equals(""));

+	assertTrue(":6a:", newText.equals("L1\r\nL4\r\n"));

+	assertTrue(":6b:",content.getLineCount() == 3);

+	assertTrue(":6c:", content.getLine(0).equals("L1"));

+	assertTrue(":6d:", content.getLine(1).equals("L4"));

+	assertTrue(":6e:", content.getLine(2).equals(""));

 


 	content.setText("\nL1\r\nL2");

 	content.replaceTextRange(0, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":7a:", newText.equals("L1\r\nL2"));

-	assert(":7b:",content.getLineCount() == 2);

-	assert(":7c:", content.getLine(0).equals("L1"));

-	assert(":7d:", content.getLine(1).equals("L2"));

+	assertTrue(":7a:", newText.equals("L1\r\nL2"));

+	assertTrue(":7b:",content.getLineCount() == 2);

+	assertTrue(":7c:", content.getLine(0).equals("L1"));

+	assertTrue(":7d:", content.getLine(1).equals("L2"));

 


 	content.setText("\nL1\r\nL2\r\n");

 	content.replaceTextRange(7, 2, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":8a:", newText.equals("\nL1\r\nL2"));

-	assert(":8b:",content.getLineCount() == 3);

-	assert(":8c:", content.getLine(0).equals(""));

-	assert(":8d:", content.getLine(1).equals("L1"));

-	assert(":8e:", content.getLine(2).equals("L2"));

+	assertTrue(":8a:", newText.equals("\nL1\r\nL2"));

+	assertTrue(":8b:",content.getLineCount() == 3);

+	assertTrue(":8c:", content.getLine(0).equals(""));

+	assertTrue(":8d:", content.getLine(1).equals("L1"));

+	assertTrue(":8e:", content.getLine(2).equals("L2"));

 


 	content.setText("\nLine 1\nLine 2\n");

 	content.replaceTextRange(0, 7, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":9a:", newText.equals("\nLine 2\n"));

-	assert(":9b:", content.getLineCount() == 3);

-	assert(":9c:", content.getLine(0).equals(""));

-	assert(":9d:", content.getLine(1).equals("Line 2"));

-	assert(":9e:", content.getLine(2).equals(""));

+	assertTrue(":9a:", newText.equals("\nLine 2\n"));

+	assertTrue(":9b:", content.getLineCount() == 3);

+	assertTrue(":9c:", content.getLine(0).equals(""));

+	assertTrue(":9d:", content.getLine(1).equals("Line 2"));

+	assertTrue(":9e:", content.getLine(2).equals(""));

 


 	content.setText("Line 1\nLine 2\n");

 	content.replaceTextRange(6, 8, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":10a:", newText.equals("Line 1"));

-	assert(":10b:", content.getLineCount() == 1);

-	assert(":10c:", content.getLine(0).equals("Line 1"));

+	assertTrue(":10a:", newText.equals("Line 1"));

+	assertTrue(":10b:", content.getLineCount() == 1);

+	assertTrue(":10c:", content.getLine(0).equals("Line 1"));

 


 	content.setText("Line one is short\r\nLine 2 is a longer line\r\nLine 3\n");

 	content.replaceTextRange(12, 17, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));

-	assert(":11b:", content.getLineCount() == 3);

-	assert(":11c:", content.getLine(0).equals("Line one is a longer line"));

-	assert(":11d:", content.getLine(1).equals("Line 3"));

-	assert(":11e:", content.getLine(2).equals(""));

+	assertTrue(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));

+	assertTrue(":11b:", content.getLineCount() == 3);

+	assertTrue(":11c:", content.getLine(0).equals("Line one is a longer line"));

+	assertTrue(":11d:", content.getLine(1).equals("Line 3"));

+	assertTrue(":11e:", content.getLine(2).equals(""));

 


 }

 public void test_Replace() {

@@ -693,37 +693,37 @@ public void test_Replace() {
 	content.setText("This\nis a test\r");

 	content.replaceTextRange(5, 4, "a");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":1a:", newText.equals("This\na test\r"));

-	assert(":1b:",content.getLineCount() == 3);

-	assert(":1c:", content.getLine(0).equals("This"));

-	assert(":1d:", content.getLine(1).equals("a test"));

-	assert(":1e:", content.getLine(2).equals(""));

+	assertTrue(":1a:", newText.equals("This\na test\r"));

+	assertTrue(":1b:",content.getLineCount() == 3);

+	assertTrue(":1c:", content.getLine(0).equals("This"));

+	assertTrue(":1d:", content.getLine(1).equals("a test"));

+	assertTrue(":1e:", content.getLine(2).equals(""));

 


 	content.setText("This\nis a test\r");

 	content.replaceTextRange(5, 2, "was");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":2a:", newText.equals("This\nwas a test\r"));

-	assert(":2b:",content.getLineCount() == 3);

-	assert(":2c:", content.getLine(0).equals("This"));

-	assert(":2d:", content.getLine(1).equals("was a test"));

-	assert(":2e:", content.getLine(2).equals(""));

+	assertTrue(":2a:", newText.equals("This\nwas a test\r"));

+	assertTrue(":2b:",content.getLineCount() == 3);

+	assertTrue(":2c:", content.getLine(0).equals("This"));

+	assertTrue(":2d:", content.getLine(1).equals("was a test"));

+	assertTrue(":2e:", content.getLine(2).equals(""));

 


 	content.setText("This is a test\r");

 	content.replaceTextRange(5, 2, "was");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3a:", newText.equals("This was a test\r"));

-	assert(":3b:",content.getLineCount() == 2);

-	assert(":3c:", content.getLine(0).equals("This was a test"));

-	assert(":3d:", content.getLineAtOffset(15) == 0);

+	assertTrue(":3a:", newText.equals("This was a test\r"));

+	assertTrue(":3b:",content.getLineCount() == 2);

+	assertTrue(":3c:", content.getLine(0).equals("This was a test"));

+	assertTrue(":3d:", content.getLineAtOffset(15) == 0);

 	

 	content.setText("Line 1\nLine 2\nLine 3");

 	content.replaceTextRange(0, 7, "La\nLb\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));

-	assert(":4b:", content.getLine(0).equals("La"));

-	assert(":4c:", content.getLine(1).equals("Lb"));

-	assert(":4d:", content.getLine(2).equals("Line 2"));

-	assert(":4e:", content.getLine(3).equals("Line 3"));

+	assertTrue(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));

+	assertTrue(":4b:", content.getLine(0).equals("La"));

+	assertTrue(":4c:", content.getLine(1).equals("Lb"));

+	assertTrue(":4d:", content.getLine(2).equals("Line 2"));

+	assertTrue(":4e:", content.getLine(3).equals("Line 3"));

 


 	content.setText(getTestText());

 	newText = content.getTextRange(0, content.getCharCount());

@@ -731,133 +731,133 @@ public void test_Replace() {
 	int end = content.getOffsetAtLine(11);

 	content.replaceTextRange(start, end - start, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":5a:", content.getLineCount() == 12);

-	assert(":5a:", content.getLine(5).equals(""));

-	assert(":5a:", content.getLine(6).equals(""));

+	assertTrue(":5a:", content.getLineCount() == 12);

+	assertTrue(":5a:", content.getLine(5).equals(""));

+	assertTrue(":5a:", content.getLine(6).equals(""));

 	start = content.getOffsetAtLine(7);

 	content.replaceTextRange(start, content.getCharCount() - start, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":5a:", content.getLineCount() == 8);

-	assert(":5a:", content.getLine(5).equals(""));

-	assert(":5a:", content.getLine(6).equals(""));

-	assert(":5a:", content.getLine(7).equals(""));

+	assertTrue(":5a:", content.getLineCount() == 8);

+	assertTrue(":5a:", content.getLine(5).equals(""));

+	assertTrue(":5a:", content.getLine(6).equals(""));

+	assertTrue(":5a:", content.getLine(7).equals(""));

 


 }

 public void test_Special_Cases() {

 	String newText;

 	StyledTextContent content = getContentInstance();

-	assert(":0a:", content.getLineCount() == 1);

-	assert(":0b:", content.getOffsetAtLine(0) == 0);

+	assertTrue(":0a:", content.getLineCount() == 1);

+	assertTrue(":0b:", content.getOffsetAtLine(0) == 0);

 	

 	content.setText("This is the input/output text component.");

 	content.replaceTextRange(0, 0, "\n");

-	assert(":1a:", content.getLine(0).equals(""));

+	assertTrue(":1a:", content.getLine(0).equals(""));

 	content.replaceTextRange(1, 0, "\n");

-	assert(":1b:",content.getLine(0).equals(""));

+	assertTrue(":1b:",content.getLine(0).equals(""));

 	content.replaceTextRange(2, 0, "\n");

-	assert(":1c:",content.getLine(0).equals(""));

+	assertTrue(":1c:",content.getLine(0).equals(""));

 	content.replaceTextRange(3, 0, "\n");

-	assert(":1d:",content.getLine(0).equals(""));

+	assertTrue(":1d:",content.getLine(0).equals(""));

 	content.replaceTextRange(4, 0, "\n");

-	assert(":1e:",content.getLine(0).equals(""));

+	assertTrue(":1e:",content.getLine(0).equals(""));

 	content.replaceTextRange(5, 0, "\n");

-	assert(":1f:",content.getLine(0).equals(""));

+	assertTrue(":1f:",content.getLine(0).equals(""));

 	content.replaceTextRange(6, 0, "\n");

-	assert(":1g:",content.getLine(0).equals(""));

+	assertTrue(":1g:",content.getLine(0).equals(""));

 	content.replaceTextRange(7, 0, "\n");

-	assert(":1h:",content.getLine(0).equals(""));

+	assertTrue(":1h:",content.getLine(0).equals(""));

 


 	content.setText("This is the input/output text component.");

 	content.replaceTextRange(0, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":2a:", newText.equals("\nThis is the input/output text component."));

-	assert(":2b:", content.getLine(0).equals(""));

-	assert(":2c:", content.getLine(1).equals("This is the input/output text component."));

+	assertTrue(":2a:", newText.equals("\nThis is the input/output text component."));

+	assertTrue(":2b:", content.getLine(0).equals(""));

+	assertTrue(":2c:", content.getLine(1).equals("This is the input/output text component."));

 	content.replaceTextRange(1, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":2d:", newText.equals("\n\nThis is the input/output text component."));

-	assert(":2e:", content.getLine(0).equals(""));

-	assert(":2f:", content.getLine(1).equals(""));

-	assert(":2g:", content.getLine(2).equals("This is the input/output text component."));

+	assertTrue(":2d:", newText.equals("\n\nThis is the input/output text component."));

+	assertTrue(":2e:", content.getLine(0).equals(""));

+	assertTrue(":2f:", content.getLine(1).equals(""));

+	assertTrue(":2g:", content.getLine(2).equals("This is the input/output text component."));

 


 	content.replaceTextRange(2, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3a:", newText.equals("\n\n\nThis is the input/output text component."));

-	assert(":3b:", content.getLine(0).equals(""));

-	assert(":3c:", content.getLine(1).equals(""));

-	assert(":3d:", content.getLine(2).equals(""));

-	assert(":3e:", content.getLine(3).equals("This is the input/output text component."));

+	assertTrue(":3a:", newText.equals("\n\n\nThis is the input/output text component."));

+	assertTrue(":3b:", content.getLine(0).equals(""));

+	assertTrue(":3c:", content.getLine(1).equals(""));

+	assertTrue(":3d:", content.getLine(2).equals(""));

+	assertTrue(":3e:", content.getLine(3).equals("This is the input/output text component."));

 	content.replaceTextRange(3, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));

-	assert(":3g:", content.getLine(0).equals(""));

-	assert(":3h:", content.getLine(1).equals(""));

-	assert(":3i:", content.getLine(2).equals(""));

-	assert(":3j:", content.getLine(3).equals(""));

-	assert(":3k:", content.getLine(4).equals("This is the input/output text component."));

+	assertTrue(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));

+	assertTrue(":3g:", content.getLine(0).equals(""));

+	assertTrue(":3h:", content.getLine(1).equals(""));

+	assertTrue(":3i:", content.getLine(2).equals(""));

+	assertTrue(":3j:", content.getLine(3).equals(""));

+	assertTrue(":3k:", content.getLine(4).equals("This is the input/output text component."));

 


 	content.replaceTextRange(3, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4a:", newText.equals("\n\n\nThis is the input/output text component."));

-	assert(":4b:", content.getLine(0).equals(""));

-	assert(":4c:", content.getLine(1).equals(""));

-	assert(":4d:", content.getLine(2).equals(""));

-	assert(":4e:", content.getLine(3).equals("This is the input/output text component."));

+	assertTrue(":4a:", newText.equals("\n\n\nThis is the input/output text component."));

+	assertTrue(":4b:", content.getLine(0).equals(""));

+	assertTrue(":4c:", content.getLine(1).equals(""));

+	assertTrue(":4d:", content.getLine(2).equals(""));

+	assertTrue(":4e:", content.getLine(3).equals("This is the input/output text component."));

 	content.replaceTextRange(2, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":4f:", newText.equals("\n\nThis is the input/output text component."));

-	assert(":4g:", content.getLine(0).equals(""));

-	assert(":4h:", content.getLine(1).equals(""));

-	assert(":4i:", content.getLine(2).equals("This is the input/output text component."));

+	assertTrue(":4f:", newText.equals("\n\nThis is the input/output text component."));

+	assertTrue(":4g:", content.getLine(0).equals(""));

+	assertTrue(":4h:", content.getLine(1).equals(""));

+	assertTrue(":4i:", content.getLine(2).equals("This is the input/output text component."));

 


 	content.replaceTextRange(2, 0, "a");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":5a:", newText.equals("\n\naThis is the input/output text component."));

-	assert(":5b:", content.getLine(0).equals(""));

-	assert(":5c:", content.getLine(1).equals(""));

-	assert(":5d:", content.getLine(2).equals("aThis is the input/output text component."));

+	assertTrue(":5a:", newText.equals("\n\naThis is the input/output text component."));

+	assertTrue(":5b:", content.getLine(0).equals(""));

+	assertTrue(":5c:", content.getLine(1).equals(""));

+	assertTrue(":5d:", content.getLine(2).equals("aThis is the input/output text component."));

 


 	content.setText("abc\r\ndef");

 	content.replaceTextRange(1, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6a:", newText.equals("ac\r\ndef"));

-	assert(":6b:", content.getLineCount() == 2);

-	assert(":6c:", content.getLine(0).equals("ac"));

-	assert(":6d:", content.getLine(1).equals("def"));

+	assertTrue(":6a:", newText.equals("ac\r\ndef"));

+	assertTrue(":6b:", content.getLineCount() == 2);

+	assertTrue(":6c:", content.getLine(0).equals("ac"));

+	assertTrue(":6d:", content.getLine(1).equals("def"));

 	content.replaceTextRange(1, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6e:", newText.equals("a\r\ndef"));

-	assert(":6f:", content.getLineCount() == 2);

-	assert(":6g:", content.getLine(0).equals("a"));

-	assert(":6h:", content.getLine(1).equals("def"));

+	assertTrue(":6e:", newText.equals("a\r\ndef"));

+	assertTrue(":6f:", content.getLineCount() == 2);

+	assertTrue(":6g:", content.getLine(0).equals("a"));

+	assertTrue(":6h:", content.getLine(1).equals("def"));

 	content.replaceTextRange(1, 2, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6i:", newText.equals("adef"));

-	assert(":6j:", content.getLineCount() == 1);

-	assert(":6k:", content.getLine(0).equals("adef"));

+	assertTrue(":6i:", newText.equals("adef"));

+	assertTrue(":6j:", content.getLineCount() == 1);

+	assertTrue(":6k:", content.getLine(0).equals("adef"));

 	content.replaceTextRange(1, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6l:", newText.equals("aef"));

-	assert(":6m:", content.getLineCount() == 1);

-	assert(":6n:", content.getLine(0).equals("aef"));

+	assertTrue(":6l:", newText.equals("aef"));

+	assertTrue(":6m:", content.getLineCount() == 1);

+	assertTrue(":6n:", content.getLine(0).equals("aef"));

 	content.replaceTextRange(1, 1, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":6o:", newText.equals("af"));

-	assert(":6p:", content.getLineCount() == 1);

-	assert(":6q:", content.getLine(0).equals("af"));

+	assertTrue(":6o:", newText.equals("af"));

+	assertTrue(":6p:", content.getLineCount() == 1);

+	assertTrue(":6q:", content.getLine(0).equals("af"));

 


 	content.setText("abc");

 	content.replaceTextRange(0, 1, "1");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":7a:", content.getLineCount() == 1);

-	assert(":7b:", newText.equals("1bc"));

-	assert(":7c:", content.getLine(0).equals("1bc"));

+	assertTrue(":7a:", content.getLineCount() == 1);

+	assertTrue(":7b:", newText.equals("1bc"));

+	assertTrue(":7c:", content.getLine(0).equals("1bc"));

 	content.replaceTextRange(0, 0, "\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":7d:", newText.equals("\n1bc"));

-	assert(":7e:", content.getLineCount() == 2);

-	assert(":7f:", content.getLine(0).equals(""));

-	assert(":7g:", content.getLine(1).equals("1bc"));

+	assertTrue(":7d:", newText.equals("\n1bc"));

+	assertTrue(":7e:", content.getLineCount() == 2);

+	assertTrue(":7f:", content.getLine(0).equals(""));

+	assertTrue(":7g:", content.getLine(1).equals("1bc"));

 	

 	content = getContentInstance();

 	content.replaceTextRange(0,0,"a");

@@ -865,14 +865,14 @@ public void test_Special_Cases() {
 	content.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");

 	content.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":8a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));

-	assert(":8b:", content.getLineCount() == 6);

-	assert(":8c:", content.getLine(0).equals("package test;"));

-	assert(":8d:", content.getLine(1).equals("\t/*Line 1"));

-	assert(":8e:", content.getLine(2).equals("\t * Line 2"));

-	assert(":8f:", content.getLine(3).equals("\t */"));

-	assert(":8g:", content.getLine(4).equals("public class SimpleClass {"));

-	assert(":8h:", content.getLine(5).equals("}"));

+	assertTrue(":8a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));

+	assertTrue(":8b:", content.getLineCount() == 6);

+	assertTrue(":8c:", content.getLine(0).equals("package test;"));

+	assertTrue(":8d:", content.getLine(1).equals("\t/*Line 1"));

+	assertTrue(":8e:", content.getLine(2).equals("\t * Line 2"));

+	assertTrue(":8f:", content.getLine(3).equals("\t */"));

+	assertTrue(":8g:", content.getLine(4).equals("public class SimpleClass {"));

+	assertTrue(":8h:", content.getLine(5).equals("}"));

 }

 public void test_Text_Changed_Event() {

 	StyledTextContent content = getContentInstance();

@@ -892,7 +892,7 @@ public void test_Text_Changed_Event() {
 	verify = 4;

 	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");

 	try {content.replaceTextRange(3, 1, "test\n");}

-	catch (IllegalArgumentException ex) {assert(":4:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":4:", true);}

 


 	verify = 5;

 	content.setText("Line 1\r\nLine 2");

@@ -917,12 +917,12 @@ public void test_Text_Changed_Event() {
 	verify = 10;

 	content.setText("L1\r\n");

 	try {content.replaceTextRange(3, 1, "");} 

-	catch (IllegalArgumentException ex) {assert(":10:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":10:", true);}

 


 	verify = 11;

 	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");

 	try {content.replaceTextRange(1, 2, "");}

-	catch (IllegalArgumentException ex) {assert(":11:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":11:", true);}

 


 	verify = 12;

 	content.setText("L1\r");

@@ -935,7 +935,7 @@ public void test_Text_Changed_Event() {
 	verify = 14;

 	content.setText("L1\r\n");

 	try {content.replaceTextRange(3, 0, "test");}

-	catch (IllegalArgumentException ex) {assert(":14:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":14:", true);}

 


 	verify = 15;

 	content.setText("L1\r\n");

@@ -944,12 +944,12 @@ public void test_Text_Changed_Event() {
 	verify = 16;

 	content.setText("L1\r\n");

 	try {content.replaceTextRange(3, 1, "test\r\n");}

-	catch (IllegalArgumentException ex) {assert(":16:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":16:", true);}

 


 	verify = 17;

 	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");

 	try {content.replaceTextRange(1, 2, "test\n\n");}

-	catch (IllegalArgumentException ex) {assert(":17:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":17:", true);}

 


 	verify = 18;

  	content.setText("L1\r");

@@ -961,7 +961,7 @@ public void test_Text_Changed_Event() {
 	verify = 20;

 	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");

 	try {content.replaceTextRange(3, 1, "test\n");}

-	catch (IllegalArgumentException ex) {assert(":20:", true);}

+	catch (IllegalArgumentException ex) {assertTrue(":20:", true);}

 

 

 	verify = 0;

@@ -974,27 +974,27 @@ public void test_Delimiter_Special_Cases() {
 	content.setText("\nL1\r\nL2\r\n");

 	content.replaceTextRange(7, 2, "");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":1:", newText.equals("\nL1\r\nL2"));

+	assertTrue(":1:", newText.equals("\nL1\r\nL2"));

 	

 	content.setText("L1\r\n");

 	content.replaceTextRange(2, 2, "test\n\n");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":2:", newText.equals("L1test\n\n"));

+	assertTrue(":2:", newText.equals("L1test\n\n"));

 

 //	content.setText("L1\r\n");

 //	content.replaceTextRange(3, 1, "test\r\n");

 //	newText = content.getTextRange(0, content.getCharCount());

-//	assert(":3:", newText.equals("L1\rtest\r\n"));

+//	assertTrue(":3:", newText.equals("L1\rtest\r\n"));

 

 //	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");

 //	content.replaceTextRange(1, 2, "test\n\n");

 //	newText = content.getTextRange(0, content.getCharCount());

-//	assert(":4:", newText.equals("Ltest\n\n\nL2\r\nL3\r\nL4\r\n"));

+//	assertTrue(":4:", newText.equals("Ltest\n\n\nL2\r\nL3\r\nL4\r\n"));

 

 	content.setText("L1\n");

 	content.replaceTextRange(2, 0, "test\r\r\r");

 	newText = content.getTextRange(0, content.getCharCount());

-	assert(":3:", newText.equals("L1test\r\r\r\n"));

+	assertTrue(":3:", newText.equals("L1test\r\r\r\n"));

 }

 protected void setUp()  {

 	// create shell