Attachment #80119 for bug #204845

View | Details | Raw Unified | Return to bug 204845
Collapse All | Expand All




	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);
}

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 getJCEJarAsQuotedString() {
		if (Util.isMacOS()) {
			return "\"" + JRE_HOME_DIR + "/../Classes/jce.jar\"";
		}
		return "\"" + JRE_HOME_DIR + "/lib/jce.jar\"";
	}

	private String getExtDirectory() {

        },
        "\"" + OUTPUT_DIR +  File.separator + "X.java\""
        + " -1.5 -g -preserveAllLocals"
        + " -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" +

        },
        "\"" + OUTPUT_DIR +  File.separator + "X.java\""
        + " -1.5 -g -preserveAllLocals"
        + " -bootclasspath " + getLibraryClassesAsQuotedString()
        + " -cp " + getJCEJarAsQuotedString()
        + " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"
        + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
        "",

			"}"},
        "\"" + OUTPUT_DIR +  File.separator + "X.java\""
        + " -1.5 -g -preserveAllLocals"
        + " -bootclasspath " + getLibraryClassesAsQuotedString()
        + " -cp " + getJCEJarAsQuotedString()
        + " -warn:+null"
        + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
        "",

			"}"},
        "\"" + OUTPUT_DIR +  File.separator + "X.java\""
        + " -1.5 -g -preserveAllLocals"
        + " -bootclasspath " + getLibraryClassesAsQuotedString()
        + " -cp " + getJCEJarAsQuotedString()
        + " -warn:-null" // contrast with test036
        + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
        "",

        "\"" + OUTPUT_DIR +  File.separator +
        	"Z.java\""
        + " -1.5"
        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
          OUTPUT_DIR + File.separator + source1 + "\""
        + "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"
        + " -d \"" + OUTPUT_DIR + File.separator + output2 + "\"",

        "\"" + OUTPUT_DIR +  File.separator +
        	"Z.java\""
        + " -1.5"
        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
          OUTPUT_DIR + File.separator + source1 + "\""
        + "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",
		"",

        "\"" + OUTPUT_DIR +  File.separator +
        	"Z.java\""
        + " -1.5"
        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
          OUTPUT_DIR + File.separator + source1 + "\""
        + "[-d none]",
		"",

        "\"" + OUTPUT_DIR +  File.separator +
        	"Z.java\""
        + " -1.5"
        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
          OUTPUT_DIR + File.separator + source1 + "\""
        + "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"
        + " -d none",

        "\"" + OUTPUT_DIR +  File.separator +
        	"Z.java\""
        + " -1.5"
        + " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator +
        	"\"" + OUTPUT_DIR + File.separator + source1 + "\"" +
        	"[-**/*][-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",
		"",

			"}"},
     "\"" + OUTPUT_DIR +  File.separator + "X.java\""
     + " -1.5 -g -preserveAllLocals"
     + " -bootclasspath " + getLibraryClassesAsQuotedString()
     + " -cp " + getJCEJarAsQuotedString()
     + " -warn:+nullDereference"
     + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
     "",

			"}"},
  "\"" + OUTPUT_DIR +  File.separator + "X.java\""
  + " -1.5 -g -preserveAllLocals"
  + " -bootclasspath " + getLibraryClassesAsQuotedString()
  + " -cp " + getJCEJarAsQuotedString()
  + " -warn:+null"
  + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
  "",

			"}"},
"\"" + OUTPUT_DIR +  File.separator + "X.java\""
+ " -1.5 -g -preserveAllLocals"
+ " -bootclasspath " + getLibraryClassesAsQuotedString()
+ " -cp " + getJCEJarAsQuotedString()
+ " -warn:+nullDereference"
+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
"",

			"}\n"},
  "\"" + OUTPUT_DIR +  File.separator + "X.java\""
  + " -1.5 -g -preserveAllLocals"
  + " -bootclasspath " + getLibraryClassesAsQuotedString()
  + " -cp " + getJCEJarAsQuotedString()
  + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
  "",
  "",

			"}\n"},
  "\"" + OUTPUT_DIR +  File.separator + "X.java\""
  + " -1.5 -g -preserveAllLocals"
  + " -bootclasspath " + getLibraryClassesAsQuotedString()
  + " -cp " + getJCEJarAsQuotedString()
  + " -warn:+unusedThrown"
  + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
  "",

Return to bug 204845

Lines 52-75 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java (-27 / +29 lines)
52	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);	52	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);
53	}	53	}
54		54
55	private String getLibraryClasses() {	55	private String getLibraryClassesAsQuotedString() {
56	String[] paths = Util.getJavaClassLibs();	56	String[] paths = Util.getJavaClassLibs();
57	StringBuffer buffer = new StringBuffer();	57	StringBuffer buffer = new StringBuffer();
		58	buffer.append('"');
58	for (int i = 0, max = paths.length; i < max; i++) {	59	for (int i = 0, max = paths.length; i < max; i++) {
59	if (i != 0) {	60	if (i != 0) {
60	buffer.append(File.pathSeparatorChar);	61	buffer.append(File.pathSeparatorChar);
61	}	62	}
62	buffer.append(paths[i]);	63	buffer.append(paths[i]);
63	}	64	}
		65	buffer.append('"');
64	return String.valueOf(buffer);	66	return String.valueOf(buffer);
65	}	67	}
66		68
67		69
68	private String getJCEJar() {	70	private String getJCEJarAsQuotedString() {
69	if (Util.isMacOS()) {	71	if (Util.isMacOS()) {
70	return JRE_HOME_DIR + "/../Classes/jce.jar";	72	return "\"" + JRE_HOME_DIR + "/../Classes/jce.jar\"";
71	}	73	}
72	return JRE_HOME_DIR + "/lib/jce.jar";	74	return "\"" + JRE_HOME_DIR + "/lib/jce.jar\"";
73	}	75	}
74		76
75	private String getExtDirectory() {	77	private String getExtDirectory() {
Lines 762-769 Link Here
762	},	764	},
763	"\"" + OUTPUT_DIR + File.separator + "X.java\""	765	"\"" + OUTPUT_DIR + File.separator + "X.java\""
764	+ " -1.5 -g -preserveAllLocals"	766	+ " -1.5 -g -preserveAllLocals"
765	+ " -bootclasspath " + getLibraryClasses()	767	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
766	+ " -cp " + getJCEJar()	768	+ " -cp " + getJCEJarAsQuotedString()
767	+ " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"	769	+ " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"
768	+ " -verbose -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	770	+ " -verbose -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
769	"[parsing ---OUTPUT_DIR_PLACEHOLDER---/X.java - #1/1]\n" +	771	"[parsing ---OUTPUT_DIR_PLACEHOLDER---/X.java - #1/1]\n" +
Lines 801-808 Link Here
801	},	803	},
802	"\"" + OUTPUT_DIR + File.separator + "X.java\""	804	"\"" + OUTPUT_DIR + File.separator + "X.java\""
803	+ " -1.5 -g -preserveAllLocals"	805	+ " -1.5 -g -preserveAllLocals"
804	+ " -bootclasspath " + getLibraryClasses()	806	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
805	+ " -cp " + getJCEJar()	807	+ " -cp " + getJCEJarAsQuotedString()
806	+ " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"	808	+ " -warn:+deprecation,syntheticAccess,uselessTypeCheck,unsafe,finalBound,unusedLocal"
807	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	809	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
808	"",	810	"",
Lines 2801-2808 Link Here
2801	"}"},	2803	"}"},
2802	"\"" + OUTPUT_DIR + File.separator + "X.java\""	2804	"\"" + OUTPUT_DIR + File.separator + "X.java\""
2803	+ " -1.5 -g -preserveAllLocals"	2805	+ " -1.5 -g -preserveAllLocals"
2804	+ " -bootclasspath " + getLibraryClasses()	2806	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
2805	+ " -cp " + getJCEJar()	2807	+ " -cp " + getJCEJarAsQuotedString()
2806	+ " -warn:+null"	2808	+ " -warn:+null"
2807	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	2809	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
2808	"",	2810	"",
Lines 2829-2836 Link Here
2829	"}"},	2831	"}"},
2830	"\"" + OUTPUT_DIR + File.separator + "X.java\""	2832	"\"" + OUTPUT_DIR + File.separator + "X.java\""
2831	+ " -1.5 -g -preserveAllLocals"	2833	+ " -1.5 -g -preserveAllLocals"
2832	+ " -bootclasspath " + getLibraryClasses()	2834	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
2833	+ " -cp " + getJCEJar()	2835	+ " -cp " + getJCEJarAsQuotedString()
2834	+ " -warn:-null" // contrast with test036	2836	+ " -warn:-null" // contrast with test036
2835	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	2837	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
2836	"",	2838	"",
Lines 3924-3930 Link Here
3924	"\"" + OUTPUT_DIR + File.separator +	3926	"\"" + OUTPUT_DIR + File.separator +
3925	"Z.java\""	3927	"Z.java\""
3926	+ " -1.5"	3928	+ " -1.5"
3927	+ " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +	3929	+ " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
3928	OUTPUT_DIR + File.separator + source1 + "\""	3930	OUTPUT_DIR + File.separator + source1 + "\""
3929	+ "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"	3931	+ "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"
3930	+ " -d \"" + OUTPUT_DIR + File.separator + output2 + "\"",	3932	+ " -d \"" + OUTPUT_DIR + File.separator + output2 + "\"",
Lines 3964-3970 Link Here
3964	"\"" + OUTPUT_DIR + File.separator +	3966	"\"" + OUTPUT_DIR + File.separator +
3965	"Z.java\""	3967	"Z.java\""
3966	+ " -1.5"	3968	+ " -1.5"
3967	+ " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +	3969	+ " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
3968	OUTPUT_DIR + File.separator + source1 + "\""	3970	OUTPUT_DIR + File.separator + source1 + "\""
3969	+ "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",	3971	+ "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",
3970	"",	3972	"",
Lines 3998-4004 Link Here
3998	"\"" + OUTPUT_DIR + File.separator +	4000	"\"" + OUTPUT_DIR + File.separator +
3999	"Z.java\""	4001	"Z.java\""
4000	+ " -1.5"	4002	+ " -1.5"
4001	+ " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +	4003	+ " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
4002	OUTPUT_DIR + File.separator + source1 + "\""	4004	OUTPUT_DIR + File.separator + source1 + "\""
4003	+ "[-d none]",	4005	+ "[-d none]",
4004	"",	4006	"",
Lines 4030-4036 Link Here
4030	"\"" + OUTPUT_DIR + File.separator +	4032	"\"" + OUTPUT_DIR + File.separator +
4031	"Z.java\""	4033	"Z.java\""
4032	+ " -1.5"	4034	+ " -1.5"
4033	+ " -bootclasspath " + getLibraryClasses() + File.pathSeparator + "\"" +	4035	+ " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator + "\"" +
4034	OUTPUT_DIR + File.separator + source1 + "\""	4036	OUTPUT_DIR + File.separator + source1 + "\""
4035	+ "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"	4037	+ "[-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]"
4036	+ " -d none",	4038	+ " -d none",
Lines 4085-4091 Link Here
4085	"\"" + OUTPUT_DIR + File.separator +	4087	"\"" + OUTPUT_DIR + File.separator +
4086	"Z.java\""	4088	"Z.java\""
4087	+ " -1.5"	4089	+ " -1.5"
4088	+ " -bootclasspath " + getLibraryClasses() + File.pathSeparator +	4090	+ " -bootclasspath " + getLibraryClassesAsQuotedString() + File.pathSeparator +
4089	"\"" + OUTPUT_DIR + File.separator + source1 + "\"" +	4091	"\"" + OUTPUT_DIR + File.separator + source1 + "\"" +
4090	"[-*/][-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",	4092	"[-*/][-d \"" + OUTPUT_DIR + File.separator + output1 + "\"]",
4091	"",	4093	"",
Lines 5215-5222 Link Here
5215	"}"},	5217	"}"},
5216	"\"" + OUTPUT_DIR + File.separator + "X.java\""	5218	"\"" + OUTPUT_DIR + File.separator + "X.java\""
5217	+ " -1.5 -g -preserveAllLocals"	5219	+ " -1.5 -g -preserveAllLocals"
5218	+ " -bootclasspath " + getLibraryClasses()	5220	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
5219	+ " -cp " + getJCEJar()	5221	+ " -cp " + getJCEJarAsQuotedString()
5220	+ " -warn:+nullDereference"	5222	+ " -warn:+nullDereference"
5221	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	5223	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
5222	"",	5224	"",
Lines 5244-5251 Link Here
5244	"}"},	5246	"}"},
5245	"\"" + OUTPUT_DIR + File.separator + "X.java\""	5247	"\"" + OUTPUT_DIR + File.separator + "X.java\""
5246	+ " -1.5 -g -preserveAllLocals"	5248	+ " -1.5 -g -preserveAllLocals"
5247	+ " -bootclasspath " + getLibraryClasses()	5249	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
5248	+ " -cp " + getJCEJar()	5250	+ " -cp " + getJCEJarAsQuotedString()
5249	+ " -warn:+null"	5251	+ " -warn:+null"
5250	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	5252	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
5251	"",	5253	"",
Lines 5273-5280 Link Here
5273	"}"},	5275	"}"},
5274	"\"" + OUTPUT_DIR + File.separator + "X.java\""	5276	"\"" + OUTPUT_DIR + File.separator + "X.java\""
5275	+ " -1.5 -g -preserveAllLocals"	5277	+ " -1.5 -g -preserveAllLocals"
5276	+ " -bootclasspath " + getLibraryClasses()	5278	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
5277	+ " -cp " + getJCEJar()	5279	+ " -cp " + getJCEJarAsQuotedString()
5278	+ " -warn:+nullDereference"	5280	+ " -warn:+nullDereference"
5279	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	5281	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
5280	"",	5282	"",
Lines 5314-5321 Link Here
5314	"}\n"},	5316	"}\n"},
5315	"\"" + OUTPUT_DIR + File.separator + "X.java\""	5317	"\"" + OUTPUT_DIR + File.separator + "X.java\""
5316	+ " -1.5 -g -preserveAllLocals"	5318	+ " -1.5 -g -preserveAllLocals"
5317	+ " -bootclasspath " + getLibraryClasses()	5319	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
5318	+ " -cp " + getJCEJar()	5320	+ " -cp " + getJCEJarAsQuotedString()
5319	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	5321	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
5320	"",	5322	"",
5321	"",	5323	"",
Lines 5333-5340 Link Here
5333	"}\n"},	5335	"}\n"},
5334	"\"" + OUTPUT_DIR + File.separator + "X.java\""	5336	"\"" + OUTPUT_DIR + File.separator + "X.java\""
5335	+ " -1.5 -g -preserveAllLocals"	5337	+ " -1.5 -g -preserveAllLocals"
5336	+ " -bootclasspath " + getLibraryClasses()	5338	+ " -bootclasspath " + getLibraryClassesAsQuotedString()
5337	+ " -cp " + getJCEJar()	5339	+ " -cp " + getJCEJarAsQuotedString()
5338	+ " -warn:+unusedThrown"	5340	+ " -warn:+unusedThrown"
5339	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",	5341	+ " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"",
5340	"",	5342	"",