Remove some illegal args and npe's when running individual tests from…

… within pde

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

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

@@ -22,9 +22,6 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
@@ -71,6 +68,9 @@
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 import org.eclipse.jdt.internal.compiler.parser.ScannerHelper;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * Class to test DOM/AST nodes built for Javadoc comments.
  *
@@ -147,11 +147,25 @@ public ASTConverterJavadocTest(String name, String support, String unix) {
 		this.unix = "true".equals(unix);
 	}
 	public ASTConverterJavadocTest(String name) {
-		this(name.substring(0, name.indexOf(" - ")),
-				name.substring(name.indexOf(" - Doc ") + 7, name.lastIndexOf("abled") + 5),
+		this(preHyphen(name), nameToSupport(name),
 				name.indexOf(" - Unix") != -1 ? "true" : "false");
 	}
 
+	private static String preHyphen(String name) {
+		int hyphenInd = name.indexOf(" - ");
+		String r = hyphenInd == -1 ? name : name.substring(0, hyphenInd);
+		return r;
+	}
+	private static String nameToSupport(String name) {
+		int ind1 = name.indexOf(" - Doc ");
+		int ind2 = name.lastIndexOf("abled");
+		if( ind1 == -1 || ind2 == -1 )
+			return name;
+		String s = name.substring(name.indexOf(" - Doc ") + 7, name.lastIndexOf("abled") + 5);
+		return s;
+	}
+
+
 	/* (non-Javadoc)
 	 * @see junit.framework.TestCase#getName()
 	 */