NPE revealed when a test fails

Signed-off-by: Rob Stryker <[email protected]>

Author: Rob Stryker

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/AbstractASTTests.java

@@ -222,8 +222,12 @@ protected void assertBindingKeysEqual(String expected, String[] actualKeys) {
 		}
 		String actual = buffer.toString();
 		if (!expected.equals(actual)) {
-			System.out.print(displayString(actual, 4));
-			System.out.println(',');
+			try {
+				System.out.print(displayString(actual, 4));
+				System.out.println(',');
+			} catch(Throwable t) {
+				// For some reason ConverterTestSetup.getExternalJCLPathString(etc) returns null directly.
+			}
 		}
 		assertEquals(
 			"Unexpected binding keys",

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java

@@ -2927,28 +2927,28 @@ protected String displayString(String toPrint, int indent) {
     			toDisplay,
     			getWorkspacePath().toCharArray(),
     			"getWorkspacePath()".toCharArray());
-    	toDisplay =
+    	toDisplay = getExternalJCLPathString() == null ? toDisplay :
     		CharOperation.replace(
     			toDisplay,
     			getExternalJCLPathString().toCharArray(),
     			"getExternalJCLPathString()".toCharArray());
-		toDisplay =
+		toDisplay = getExternalJCLPathString(minJavaVersion) == null ? toDisplay :
     		CharOperation.replace(
     			toDisplay,
     			getExternalJCLPathString(minJavaVersion).toCharArray(),
     			("getExternalJCLPathString(" + minJavaVersionEncoded + ")").toCharArray());
-		toDisplay =
+		toDisplay = getExternalPath() == null ? toDisplay :
     		CharOperation.replace(
     			toDisplay,
     			getExternalPath().toCharArray(),
     			"getExternalPath()".toCharArray());
 
-		toDisplay =
+		toDisplay = getExternalJCLSourcePathString() == null ? toDisplay :
     		CharOperation.replace(
     			toDisplay,
     			org.eclipse.jdt.core.tests.util.Util.displayString(getExternalJCLSourcePathString(), 0).toCharArray(),
     			"getExternalJCLSourcePathString()".toCharArray());
-		toDisplay =
+		toDisplay = getExternalJCLSourcePathString(minJavaVersion) == null ? toDisplay :
     		CharOperation.replace(
     			toDisplay,
     			org.eclipse.jdt.core.tests.util.Util.displayString(getExternalJCLSourcePathString(minJavaVersion), 0).toCharArray(),