Attachment 80119 Details for Bug 204845 – Fix of test cases

[patch] Fix of test cases

patch.txt (text/plain), 7.57 KB, created by Maxime Daniel

on 2007-10-11 03:16:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2007-10-11 03:16:24 EDT

Size: 7.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java,v
>retrieving revision 1.120
>diff -u -r1.120 BatchCompilerTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	4 Oct 2007 13:01:33 -0000	1.120
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	11 Oct 2007 06:59:48 -0000
>@@ -52,24 +52,26 @@
> 	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);
> }
> 
>-private String getLibraryClasses() {
>+private String getLibraryClassesAsQuotedString() {
> 	String[] paths = Util.getJavaClassLibs();
> 	StringBuffer buffer = new StringBuffer();
>+	buffer.append('"');
> 	for (int i = 0, max = paths.length; i < max; i++) {
> 		if (i != 0) {
> 			buffer.append(File.pathSeparatorChar);
> 		}
> 		buffer.append(paths[i]);
> 	}
>+	buffer.append('"');
> 	return String.valueOf(buffer);
> }
> 
> 
>-	private String getJCEJar() {
>+	private String getJCEJarAsQuotedString() {
> 		if (Util.isMacOS()) {
>-			return JRE_HOME_DIR + "/../Classes/jce.jar";
>+			return "\"" + JRE_HOME_DIR + "/../Classes/jce.jar\"";
> 		}
>-		return JRE_HOME_DIR + "/lib/jce.jar";
>+		return "\"" + JRE_HOME_DIR + "/lib/jce.jar\"";
> 	}
> 
> 	private String getExtDirectory() {
>@@ -762,8 +764,8 @@
>         },
>         "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>         + " -1.5 -g -preserveAllLocals"
>-        + " -bootclasspath " + getLibraryClasses()
>-        + " -cp " + getJCEJar()
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+        + " -cp " + getJCEJarAsQuotedString()
>         + " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"
>         + " -verbose -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>         "[parsing    ---OUTPUT_DIR_PLACEHOLDER---/X.java - #1/1]\n" +
>@@ -801,8 +803,8 @@
>         },
>         "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>         + " -1.5 -g -preserveAllLocals"
>-        + " -bootclasspath " + getLibraryClasses()
>-        + " -cp " + getJCEJar()
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+        + " -cp " + getJCEJarAsQuotedString()
>         + " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"
>         + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>         "",
>@@ -2801,8 +2803,8 @@
> 			"}"},
>         "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>         + " -1.5 -g -preserveAllLocals"
>-        + " -bootclasspath " + getLibraryClasses()
>-        + " -cp " + getJCEJar()
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+        + " -cp " + getJCEJarAsQuotedString()
>         + " -warn:+null"
>         + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>         "",
>@@ -2829,8 +2831,8 @@
> 			"}"},
>         "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>         + " -1.5 -g -preserveAllLocals"
>-        + " -bootclasspath " + getLibraryClasses()
>-        + " -cp " + getJCEJar()
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+        + " -cp " + getJCEJarAsQuotedString()
>         + " -warn:-null" // contrast with test036
>         + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>         "",
>@@ -3924,7 +3926,7 @@
>         "\"" + OUTPUT_DIR +  File.separator +
>         	"Z.java\""
>         + " -1.5"
>-        + " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
>           OUTPUT_DIR + File.separator + source1 + "\""
>         + "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"
>         + " -d \"" + OUTPUT_DIR + File.separator + output2 + "\"",
>@@ -3964,7 +3966,7 @@
>         "\"" + OUTPUT_DIR +  File.separator +
>         	"Z.java\""
>         + " -1.5"
>-        + " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
>           OUTPUT_DIR + File.separator + source1 + "\""
>         + "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",
> 		"",
>@@ -3998,7 +4000,7 @@
>         "\"" + OUTPUT_DIR +  File.separator +
>         	"Z.java\""
>         + " -1.5"
>-        + " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
>           OUTPUT_DIR + File.separator + source1 + "\""
>         + "[-d none]",
> 		"",
>@@ -4030,7 +4032,7 @@
>         "\"" + OUTPUT_DIR +  File.separator +
>         	"Z.java\""
>         + " -1.5"
>-        + " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
>           OUTPUT_DIR + File.separator + source1 + "\""
>         + "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"
>         + " -d none",
>@@ -4085,7 +4087,7 @@
>         "\"" + OUTPUT_DIR +  File.separator +
>         	"Z.java\""
>         + " -1.5"
>-        + " -bootclasspath " + getLibraryClasses() + File.pathSeparator +
>+        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator +
>         	"\"" + OUTPUT_DIR + File.separator + source1 + "\"" +
>         	"[-**/*][-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",
> 		"",
>@@ -5215,8 +5217,8 @@
> 			"}"},
>      "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>      + " -1.5 -g -preserveAllLocals"
>-     + " -bootclasspath " + getLibraryClasses()
>-     + " -cp " + getJCEJar()
>+     + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+     + " -cp " + getJCEJarAsQuotedString()
>      + " -warn:+nullDereference"
>      + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>      "",
>@@ -5244,8 +5246,8 @@
> 			"}"},
>   "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>   + " -1.5 -g -preserveAllLocals"
>-  + " -bootclasspath " + getLibraryClasses()
>-  + " -cp " + getJCEJar()
>+  + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+  + " -cp " + getJCEJarAsQuotedString()
>   + " -warn:+null"
>   + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>   "",
>@@ -5273,8 +5275,8 @@
> 			"}"},
> "\"" + OUTPUT_DIR +  File.separator + "X.java\""
> + " -1.5 -g -preserveAllLocals"
>-+ " -bootclasspath " + getLibraryClasses()
>-+ " -cp " + getJCEJar()
>++ " -bootclasspath " + getLibraryClassesAsQuotedString()
>++ " -cp " + getJCEJarAsQuotedString()
> + " -warn:+nullDereference"
> + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
> "",
>@@ -5314,8 +5316,8 @@
> 			"}\n"},
>   "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>   + " -1.5 -g -preserveAllLocals"
>-  + " -bootclasspath " + getLibraryClasses()
>-  + " -cp " + getJCEJar()
>+  + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+  + " -cp " + getJCEJarAsQuotedString()
>   + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>   "",
>   "",
>@@ -5333,8 +5335,8 @@
> 			"}\n"},
>   "\"" + OUTPUT_DIR +  File.separator + "X.java\""
>   + " -1.5 -g -preserveAllLocals"
>-  + " -bootclasspath " + getLibraryClasses()
>-  + " -cp " + getJCEJar()
>+  + " -bootclasspath " + getLibraryClassesAsQuotedString()
>+  + " -cp " + getJCEJarAsQuotedString()
>   + " -warn:+unusedThrown"
>   + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
>   "",

Actions: View | Diff

Attachments on bug 204845: 79305 | 80119