Attachment #193394 for bug #342936

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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

Lines 1-5 Link Here

(-)processors/org/eclipse/jdt/compiler/apt/tests/processors/messager/MessagerProc.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2009 BEA Systems, Inc.	2	* Copyright (c) 2007, 2011 BEA Systems, Inc.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-13 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* wharley@bea.com - initial API and implementation	9	* wharley@bea.com - initial API and implementation
10	*	10	* IBM Corporation - fix for 342936
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.jdt.compiler.apt.tests.processors.messager;	13	package org.eclipse.jdt.compiler.apt.tests.processors.messager;

Lines 1-5 Link Here

(-)src/org/eclipse/jdt/compiler/apt/tests/BatchDispatchTests.java (-2 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2007 BEA Systems, Inc.	2	* Copyright (c) 2006, 2011 BEA Systems, Inc.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-13 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* wharley@bea.com - initial API and implementation	9	* wharley@bea.com - initial API and implementation
10	*	10	* IBM Corporation - fix for 342936
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.jdt.compiler.apt.tests;	12	package org.eclipse.jdt.compiler.apt.tests;
13		13
Lines 83-88 Link Here
83	public void testProcessorArgumentsWithSystemCompiler() throws IOException {	83	public void testProcessorArgumentsWithSystemCompiler() throws IOException {
84	// System compiler	84	// System compiler
85	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	85	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		86	if (compiler == null) {
		87	System.out.println("No system java compiler available");
		88	return;
		89	}
86	internalTestProcessorArguments(compiler);	90	internalTestProcessorArguments(compiler);
87	}	91	}
88		92
Lines 105-110 Link Here
105	public void testCompilerOneClassWithSystemCompiler() throws IOException {	109	public void testCompilerOneClassWithSystemCompiler() throws IOException {
106	// System compiler	110	// System compiler
107	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	111	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		112	if (compiler == null) {
		113	System.out.println("No system java compiler available");
		114	return;
		115	}
108	internalTestGenerateClass(compiler);	116	internalTestGenerateClass(compiler);
109	}	117	}
110		118
Lines 124-129 Link Here
124	*/	132	*/
125	public void testInheritedAnnosWithSystemCompiler() throws IOException {	133	public void testInheritedAnnosWithSystemCompiler() throws IOException {
126	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	134	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		135	if (compiler == null) {
		136	System.out.println("No system java compiler available");
		137	return;
		138	}
127	internalTestInheritance(compiler, INHERITEDANNOPROC);	139	internalTestInheritance(compiler, INHERITEDANNOPROC);
128	}	140	}
129		141




/*******************************************************************************
 * Copyright (c) 2007, 2011 BEA Systems, Inc.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *    wharley@bea.com - initial API and implementation
 *    IBM Corporation - fix for 342936
*******************************************************************************/

package org.eclipse.jdt.compiler.apt.tests;


import java.util.Locale;
import java.util.ServiceLoader;

import javax.tools.DiagnosticListener;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;

	 * @param errors a StringWriter into which compiler output will be written
	 * @return true if the compilation was successful
	 */
	public static boolean compileTreeWithErrors(
			JavaCompiler compiler,
			List<String> options,
			File targetFolder,
			DiagnosticListener<? super JavaFileObject> diagnosticListener) {
		StandardJavaFileManager manager = compiler.getStandardFileManager(null, Locale.getDefault(), Charset.defaultCharset());

		// create new list containing inputfile
		List<File> files = new ArrayList<File>();
		findFilesUnder(targetFolder, files);
		Iterable<? extends JavaFileObject> units = manager.getJavaFileObjectsFromFiles(files);
		PrintWriter printWriter = new PrintWriter(errors);

		options.add("-d");
		options.add(_tmpBinFolderName);

		options.add(_tmpSrcFolderName + File.pathSeparator + _tmpGenFolderName + File.pathSeparator + _processorJarPath);
		options.add("-processorpath");
		options.add(_processorJarPath);
		// use writer to prevent System.out/err to be polluted with problems
		StringWriter writer = new StringWriter();
		CompilationTask task = compiler.getTask(writer, manager, diagnosticListener, options, null, units);
		Boolean result = task.call();

		return result.booleanValue();

Lines 8-13 Link Here

(-)src/org/eclipse/jdt/compiler/apt/tests/FilerTests.java (+5 lines)
8	* Contributors:	8	* Contributors:
9	* wharley@bea.com - initial API and implementation	9	* wharley@bea.com - initial API and implementation
10	* philippe.marschall@netcetera.ch - Regression test for 338370	10	* philippe.marschall@netcetera.ch - Regression test for 338370
		11	* IBM Corporation - fix for 342936
11	*******************************************************************************/	12	*******************************************************************************/
12		13
13	package org.eclipse.jdt.compiler.apt.tests;	14	package org.eclipse.jdt.compiler.apt.tests;
Lines 36-41 Link Here
36	*/	37	*/
37	public void testElementWithSystemCompiler() throws IOException {	38	public void testElementWithSystemCompiler() throws IOException {
38	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	39	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		40	if (compiler == null) {
		41	System.out.println("No system java compiler available");
		42	return;
		43	}
39	internalTestCreateResource(compiler, true);	44	internalTestCreateResource(compiler, true);
40	}	45	}
41		46




/*******************************************************************************
 * Copyright (c) 2007, 2011 BEA Systems, Inc. and others
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *    wharley@bea.com - initial API and implementation
 *    IBM Corporation - fix for 342936
 *******************************************************************************/

package org.eclipse.jdt.compiler.apt.tests;

import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;

import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.ToolProvider;

import junit.framework.TestCase;

 * @since 3.3
 */
public class MessagerTests extends TestCase {
	private static final String COMPARE_OK = "OK";
	// See corresponding usages in the MessagerProc class
	private static final String MESSAGERPROCNAME = "org.eclipse.jdt.compiler.apt.tests.processors.messager.MessagerProc";
	
	// Expected output for the javac compiler.
	// Note that this is actually a series of regular expressions, which will be matched line by line!
	// This is required in order to deal with things like hard-coded paths.
	private static final String[] EXPECTED_JAVAC_MESSAGES = {
		"Note\\: Informational message not associated with an element",
		".*D\\.java\\:15\\: Error on element D",
		"public class D \\{",
		"       \\^",
		".*D\\.java\\:12\\: Error on element D",
		"\\@AnnoZ\\(",
		"\\^",
		".*D\\.java\\:12\\: Error on element D",
		"\\@AnnoZ\\(",
		"\\^",
		"error\\: Error on element java\\.lang\\.String",
		".*E\\.java\\:12\\: warning\\: Warning on method foo",
		"	public void foo\\(int i\\) \\{\\}",
		"	            \\^",
		".*E\\.java\\:14\\: Note\\: Note for field j",
		"	public static int j;",
		"	                  \\^",
		".*D\\.java\\:19\\: warning\\: Error on parameter of D\\.methodDvoid",
		"	public void methodDvoid\\(DEnum dEnum1\\) \\{",
		"	                              \\^",
		"4 errors"
	};
	
	// Expected output for Eclipse compiler.
	// Note that this is actually a series of regular expressions, which will be matched line by line!
	// This is required in order to deal with things like hard-coded paths.
	private static final String[] EXPECTED_ECLIPSE_MESSAGES = {
		"----------", 
		"1\\. WARNING in \\(original file name is not available\\)", 
		"Informational message not associated with an element", 
		"----------", 
		"2\\. ERROR in .*D\\.java \\(at line 15\\)", 
		"	public class D \\{", 
		"	             \\^", 
		"Error on element D", 
		"----------", 
		"3\\. ERROR in .*D\\.java \\(at line 12\\)", 
		"	@AnnoZ\\(",
		"	\\^\\^\\^\\^\\^\\^",
		"Error on element D", 
		"----------", 
		"4\\. ERROR in .*D\\.java \\(at line 13\\)", 
		"	annoZString = \"annoZOnD\"\\)", 
		"	\\^\\^\\^\\^\\^\\^\\^\\^\\^\\^\\^", 
		"Error on element D", 
		"----------", 
		"5\\. ERROR in \\(original file name is not available\\)", 
		"Error on element java\\.lang\\.String", 
		"----------", 
		"6\\. WARNING in .*E\\.java \\(at line 12\\)", 
		"	public void foo\\(int i\\) \\{\\}", 
		"	            \\^\\^\\^\\^\\^\\^\\^\\^\\^\\^", 
		"Warning on method foo", 
		"----------", 
		"7\\. WARNING in .*E\\.java \\(at line 14\\)", 
		"	public static int j;", 
		"	                  \\^", 
		"Note for field j", 
		"----------", 
		"8\\. WARNING in .*D\\.java \\(at line 19\\)", 
		"	public void methodDvoid\\(DEnum dEnum1\\) \\{", 
		"	                              \\^\\^\\^\\^\\^\\^", 
		"Error on parameter of D\\.methodDvoid", 
		"----------", 
		"8 problems \\(4 errors, 4 warnings\\)" 
	};
	
	public final class DiagnosticReport<S> implements DiagnosticListener<S> {
		public int errors;

		DiagnosticReport() {
			this.errors = 0;
	 * in the expected, or an error string if not.
	 */
	private static String compareRegexLines(String actual, String[] expected) {
		String[] actualLines = actual.split("\n");
		if (actualLines.length != expected.length) {
			return "ERROR: expected " + expected.length + " lines but found " + actualLines.length;
		}
		public void report(Diagnostic<? extends S> diagnostic) {
			if (diagnostic.getKind() ==  Diagnostic.Kind.ERROR) {
				errors++;
			actualLines[i] = iCR > 0 ? actualLines[i].substring(0, iCR) : actualLines[i];
			int iNL = actualLines[i].indexOf('\n');
			actualLines[i] = iNL > 0 ? actualLines[i].substring(0, iNL) : actualLines[i];
			if (!Pattern.matches(pattern, actualLines[i++])) {
				--i;
				return "ERROR: mismatch at line " + i + ": actual line was [" + actualLines[i] + "]";
			}
		}
		return COMPARE_OK;
	}
	// See corresponding usages in the MessagerProc class
	private static final String MESSAGERPROCNAME = "org.eclipse.jdt.compiler.apt.tests.processors.messager.MessagerProc";

	@Override
	protected void setUp() throws Exception {
		super.setUp();

	 */
	public void testMessagerWithSystemCompiler() throws IOException {
		JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		if (compiler == null) {
			System.out.println("No system java compiler available");
			return;
		}
		DiagnosticReport<JavaFileObject> diagnosticListener = new DiagnosticReport<JavaFileObject>();
		internalTestMessager(compiler, diagnosticListener);
		// surprisingly enough javac 1.7 only reports 3 errors
		// javac 1.6 reports 4 errors as expected
		assertTrue("Wrong number of reported errors", diagnosticListener.errors >= 3);
	}

	/**

	 */
	public void testMessagerWithEclipseCompiler() throws IOException {
		JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
		DiagnosticReport<JavaFileObject> diagnosticListener = new DiagnosticReport<JavaFileObject>();
		internalTestMessager(compiler, diagnosticListener);
		assertEquals("Wrong number of reported errors", 4, diagnosticListener.errors);
	}

	/**

	 * @throws IOException
	 * @return the outputted errors, if the test succeeded enough to generate them
	 */
	private void internalTestMessager(JavaCompiler compiler, DiagnosticListener<? super JavaFileObject> diagnosticListener) throws IOException {
		System.clearProperty(MESSAGERPROCNAME);
		File targetFolder = TestUtils.concatPath(BatchTestUtils.getSrcFolderName(), "targets", "errors");
		BatchTestUtils.copyResources("targets/errors", targetFolder);

		// Turn on the MessagerProc - without this, it will just return without doing anything
		List<String> options = new ArrayList<String>();
		options.add("-A" + MESSAGERPROCNAME);
		options.add("-nowarn");

		// Invoke processing by compiling the targets.errors resources
		boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, diagnosticListener);
		boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, errors);
		
		assertTrue("errors should not be empty", errors.getBuffer().length() != 0);
		assertTrue("Compilation should have failed due to expected errors, but it didn't", !success);

		// If it succeeded, the processor will have set this property to "succeeded";

		String property = System.getProperty(MESSAGERPROCNAME);
		assertNotNull("No property", property);
		assertEquals("succeeded", property);
		
		//System.out.println(errors.getBuffer().toString());
		
		return errors.getBuffer().toString();
	}

	/* (non-Javadoc)

Lines 1-5 Link Here

(-)src/org/eclipse/jdt/compiler/apt/tests/ModelTests.java (-2 / +18 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007-2010 BEA Systems, Inc.	2	* Copyright (c) 2007, 2011 BEA Systems, Inc.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-13 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* wharley@bea.com - initial API and implementation	9	* wharley@bea.com - initial API and implementation
10	*	10	* IBM Corporation - fix for 342936
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.jdt.compiler.apt.tests;	13	package org.eclipse.jdt.compiler.apt.tests;
Lines 46-51 Link Here
46	*/	46	*/
47	public void testElementWithSystemCompiler() throws IOException {	47	public void testElementWithSystemCompiler() throws IOException {
48	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	48	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		49	if (compiler == null) {
		50	System.out.println("No system java compiler available");
		51	return;
		52	}
49	internalTest(compiler, ELEMENTPROC);	53	internalTest(compiler, ELEMENTPROC);
50	}	54	}
51		55
Lines 64-69 Link Here
64	*/	68	*/
65	public void testTypeMirrorWithSystemCompiler() throws IOException {	69	public void testTypeMirrorWithSystemCompiler() throws IOException {
66	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	70	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		71	if (compiler == null) {
		72	System.out.println("No system java compiler available");
		73	return;
		74	}
67	internalTest(compiler, TYPEMIRRORPROC);	75	internalTest(compiler, TYPEMIRRORPROC);
68	}	76	}
69		77
Lines 82-87 Link Here
82	*/	90	*/
83	public void testGenericsWithSystemCompiler() throws IOException {	91	public void testGenericsWithSystemCompiler() throws IOException {
84	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	92	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		93	if (compiler == null) {
		94	System.out.println("No system java compiler available");
		95	return;
		96	}
85	internalTest(compiler, GENERICSPROC);	97	internalTest(compiler, GENERICSPROC);
86	}	98	}
87		99
Lines 100-105 Link Here
100	*/	112	*/
101	public void testVisitorsWithSystemCompiler() throws IOException {	113	public void testVisitorsWithSystemCompiler() throws IOException {
102	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	114	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		115	if (compiler == null) {
		116	System.out.println("No system java compiler available");
		117	return;
		118	}
103	internalTest(compiler, VISITORPROC);	119	internalTest(compiler, VISITORPROC);
104	}	120	}
105		121

Lines 1-5 Link Here

(-)src/org/eclipse/jdt/compiler/apt/tests/ModelUtilTests.java (-1 / +10 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 BEA Systems, Inc.	2	* Copyright (c) 2007, 2011 BEA Systems, Inc.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* wharley@bea.com - initial API and implementation	9	* wharley@bea.com - initial API and implementation
		10	* IBM Corporation - fix for 342936
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.jdt.compiler.apt.tests;	13	package org.eclipse.jdt.compiler.apt.tests;
Lines 42-47 Link Here
42	*/	43	*/
43	public void testElementsWithSystemCompiler() throws IOException {	44	public void testElementsWithSystemCompiler() throws IOException {
44	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	45	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		46	if (compiler == null) {
		47	System.out.println("No system java compiler available");
		48	return;
		49	}
45	internalTest(compiler, ELEMENTUTILSPROC);	50	internalTest(compiler, ELEMENTUTILSPROC);
46	}	51	}
47		52
Lines 60-65 Link Here
60	*/	65	*/
61	public void testTypesWithSystemCompiler() throws IOException {	66	public void testTypesWithSystemCompiler() throws IOException {
62	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();	67	JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		68	if (compiler == null) {
		69	System.out.println("No system java compiler available");
		70	return;
		71	}
63	internalTest(compiler, TYPEUTILSPROC);	72	internalTest(compiler, TYPEUTILSPROC);
64	}	73	}
65		74




/*******************************************************************************
 * Copyright (c) 2007, 2011 BEA Systems, Inc.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *    wharley@bea.com - initial API and implementation
 *    IBM Corporation - fix for 342936
 *******************************************************************************/

package org.eclipse.jdt.compiler.apt.tests;

import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;

import javax.lang.model.SourceVersion;
import javax.tools.JavaCompiler;
import javax.tools.ToolProvider;


	 */
	public void testNegativeModelWithSystemCompiler() throws IOException {
		JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
		if (compiler == null) {
			System.out.println("No system java compiler available");
			return;
		}
		Set<SourceVersion> sourceVersions = compiler.getSourceVersions();
		if (sourceVersions.size() > 4) {
			// test fail on JDK7
			return;
		}
		internalTestNegativeModel(compiler, 0, Collections.singletonList("-A" + IGNOREJAVACBUGS));
	}


			options.addAll(extraOptions);

		// Invoke processing by compiling the targets.model resources
		boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, null);
		boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, errors);
		
		assertTrue("errors should not be empty", errors.getBuffer().length() != 0);
		assertTrue("Compilation should have failed due to expected errors, but it didn't", !success);

		// If it succeeded, the processor will have set this property to "succeeded";




/*******************************************************************************
 * Copyright (c) 2007, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation
 *    IBM Corporation - fix for 342936
 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.tool;


import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;


import org.eclipse.jdt.internal.compiler.batch.Main;
import org.eclipse.jdt.internal.compiler.batch.FileSystem.Classpath;
import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblem;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
import org.eclipse.jdt.internal.compiler.util.Messages;

			}
		}
	}
	@Override
	protected void loggingExtraProblems() {
		super.loggingExtraProblems();
		for (@SuppressWarnings("rawtypes")
			Iterator iterator = this.extraProblems.iterator(); iterator.hasNext(); ) {
			final CategorizedProblem problem = (CategorizedProblem) iterator.next();
			if (this.diagnosticListener != null) {
				this.diagnosticListener.report(new Diagnostic<JavaFileObject>() {
					@Override
					public String getCode() {
						return null;
					}
					@Override
					public long getColumnNumber() {
						if (problem instanceof DefaultProblem) {
							return ((DefaultProblem) problem).column;
						}
						return Diagnostic.NOPOS;
					}
					@Override
					public long getEndPosition() {
						if (problem instanceof DefaultProblem) {
							return ((DefaultProblem) problem).getSourceEnd();
						}
						return Diagnostic.NOPOS;
					}
					@Override
					public Kind getKind() {
						if (problem.isError()) {
							return Diagnostic.Kind.ERROR;
						}
						if (problem.isWarning()) {
							return Diagnostic.Kind.WARNING;
						}
						return Diagnostic.Kind.OTHER;
					}
					@Override
					public long getLineNumber() {
						if (problem instanceof DefaultProblem) {
							return ((DefaultProblem) problem).getSourceLineNumber();
						}
						return Diagnostic.NOPOS;
					}
					@Override
					public String getMessage(Locale locale) {
						return problem.getMessage();
					}
					@Override
					public long getPosition() {
						if (problem instanceof DefaultProblem) {
							return ((DefaultProblem) problem).getSourceStart();
						}
						return Diagnostic.NOPOS;
					}
					@Override
					public JavaFileObject getSource() {
						if (problem instanceof DefaultProblem) {
							File f = new File(new String(((DefaultProblem) problem).getOriginatingFileName()));
							if (f.exists()) {
								return new EclipseFileObject(null, f.toURI(), JavaFileObject.Kind.SOURCE, null);
							}
							return null;
						}
						return null;
					}
					@Override
					public long getStartPosition() {
						return getPosition();
					}
				});
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation
 *    IBM Corporation - fix for 342936
 *******************************************************************************/
package org.eclipse.jdt.compiler.tool.tests;


		CompilerInvocationTestsArguments arguments = (CompilerInvocationTestsArguments) extraArguments;
		StandardJavaFileManager manager = arguments.standardJavaFileManager;
		if (manager == null) {
			manager = COMPILER.getStandardFileManager(null, null, null); // will pick defaults up
		}
		List<File> files = new ArrayList<File>();
		String[] fileNames = arguments.fileNames;




/*******************************************************************************
 * Copyright (c) 2008, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    IBM Corporation - initial API and implementation
 *    IBM Corporation - fix for 342936
 *******************************************************************************/
package org.eclipse.jdt.compiler.tool.tests;



public class CompilerInvocationTests extends AbstractCompilerToolTest {
	static {
//		TESTS_NAMES = new String[] { "test019_sourcepath_without_destination" };
//		TESTS_NUMBERS = new int[] { 5 };
//		TESTS_RANGE = new int[] { 1, -1 };
	}

// exploring -d / FileManager interaction
// -d changes CLASS_OUTPUT location
public void test002_dash_d_option() {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	StandardJavaFileManager javacStandardJavaFileManager =  JAVAC_COMPILER.getStandardFileManager(null, null, null); // will pick defaults up
	runTest(
		true /* shouldCompileOK */,

// exploring -d / FileManager interaction
// -d changes CLASS_OUTPUT location (OUTPUT_DIR subdirectory)
public void test003_dash_d_option() {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	StandardJavaFileManager javacStandardJavaFileManager =  JAVAC_COMPILER.getStandardFileManager(null, null, null); // will pick defaults up
	String outputDir = OUTPUT_DIR + File.separator + "bin";
	runTest(

// ecj uses the output location from the javac standard Java file manager if it
// is set
public void test004_no_dash_d_option() throws IOException {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	File binDirectory = new File(OUTPUT_DIR + File.separator + "bin");
	binDirectory.mkdir();
	StandardJavaFileManager javacStandardJavaFileManager =  JAVAC_COMPILER.getStandardFileManager(null, null, null); // will pick defaults up

// ecj does not call setLocation on standard Java file managers; it uses 
// handleOption instead; javac does the same
public void test005_dash_d_option_custom_file_manager() {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	StandardJavaFileManager javacJavaFileManager = JAVAC_COMPILER.getStandardFileManager(null, null, null);
	SetLocationDetector customJavaFileManager =
		new SetLocationDetector(

		});
	assertEquals(OUTPUT_DIR, customJavaFileManager.getLocation(StandardLocation.CLASS_OUTPUT).toString());
	assertFalse(customJavaFileManager.matchFound());
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		customJavaFileManager =	new SetLocationDetector(javacJavaFileManager, 
					StandardLocation.CLASS_OUTPUT);
		assertTrue(JAVAC_COMPILER.getTask(null, customJavaFileManager, null, 

// exploring -d / FileManager interaction
// ecj calls getLocation on a non-javac standard Java file manager
public void test006_no_dash_d_option_custom_file_manager() throws IOException {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	File binDirectory = new File(OUTPUT_DIR + File.separator + "bin");
	binDirectory.mkdirs();
	GetLocationDetector customJavaFileManager =

	Iterator<String> remaining = remainingAsList.iterator();
	assertTrue("does not support -d option", ecjStandardJavaFileManager.handleOption("-d", remaining));
	assertEquals("unexpected consumption rate", "remainder", remaining.next());
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		StandardJavaFileManager javacStandardJavaFileManager =  
			ToolProvider.getSystemJavaCompiler().getStandardFileManager(null, null, null); // will pick defaults up
		remaining = remainingAsList.iterator();

		passed = false;
	}
	assertFalse("does not catch inappropriate -encoding option", passed);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		// this fails, which may be deemed appropriate or not; but at least
		// test #11 shows that the behavior that can be observed from the 
		// outside is inappropriate

		passed = false;
	}
	assertFalse("does not catch inappropriate -encoding option", passed);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		// compared to what the command-line javac does, this is due to be a
		// bug
		passed = true;

		} catch (Throwable t) {
			passed = false;
		}
		assertFalse("does not catch inappropriate -encoding option", passed);
	}
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=188796
// files access must happen through the user-specified file manager
// simplest source read case
public void test012_files_access_read() throws IOException {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	GetJavaFileForInputDetector customJavaFileManager =
		new GetJavaFileForInputDetector(
				JAVAC_COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */));

			"X.class"
		});
	assertTrue(customJavaFileManager.matchFound);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		customJavaFileManager.matchFound = false;
		assertTrue(JAVAC_COMPILER.getTask(null, customJavaFileManager, null, 
				Arrays.asList("-d", OUTPUT_DIR), null, 

// files access must happen through the user-specified file manager
// source file accessed through the sourcepath
public void _test013_files_access_read() throws IOException {
	if (JAVAC_COMPILER == null) {
		System.out.println("No system java compiler available");
		return;
	}
	GetJavaFileForInputDetector customJavaFileManager =
		new GetJavaFileForInputDetector(
				COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */),
				"Y.java", Kind.SOURCE);
	List<String> options = Arrays.asList(
			"-d", OUTPUT_DIR, 

			"X.class"
		});
	assertTrue(customJavaFileManager.matchFound);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		customJavaFileManager.matchFound = false;
		assertTrue(JAVAC_COMPILER.getTask(null, customJavaFileManager, null, 
				options, null, 

public void _test014_files_access_read() throws IOException {
	GetJavaFileForInputDetector customJavaFileManager =
		new GetJavaFileForInputDetector(
				COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */),
				"Y.class", Kind.CLASS);
	List<String> options = Arrays.asList(
			"-d", OUTPUT_DIR,

			"X.class"
		});
	assertTrue(customJavaFileManager.matchFound);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		// javac merely throws an exception, which is due to be a bug on their
		// side
		customJavaFileManager.matchFound = false;

public void test015_files_access_write() throws IOException {
	GetJavaFileForOutputDetector customJavaFileManager =
		new GetJavaFileForOutputDetector(
				COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */),
				"X.class");
	List<String> options = Arrays.asList("-d", OUTPUT_DIR);
	runTest(

			"X.class"
		});
	assertTrue(customJavaFileManager.matchFound);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		customJavaFileManager.matchFound = false;
		assertTrue(JAVAC_COMPILER.getTask(null, customJavaFileManager, null, 
				options, null, 

public void test016_files_access_write() throws IOException {
	GetJavaFileForOutputDetector customJavaFileManager =
		new GetJavaFileForOutputDetector(
				COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */),
				"Y.class");
	List<String> options = Arrays.asList(
			"-sourcepath", OUTPUT_DIR + File.separator + "src2");

			"src/X.class"
		});
	assertTrue(customJavaFileManager.matchFound);
	if (RUN_JAVAC && JAVAC_COMPILER != null) {
		customJavaFileManager.matchFound = false;
		assertTrue(JAVAC_COMPILER.getTask(null, customJavaFileManager, null, 
				options, null, 

}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=227583
public void test019_sourcepath_without_destination() throws IOException {
	String sourceDirectoryName = OUTPUT_DIR + "/src2";
	File sourceFolder = new File(sourceDirectoryName);
	if (!sourceFolder.exists()) {
		if (!sourceFolder.mkdirs()) {
			// source folder could not be built
			return;
		}
	}
	StandardJavaFileManager ecjStandardJavaFileManager =
		COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */);
	assertTrue(ecjStandardJavaFileManager.handleOption(
			"-sourcepath", 
			Arrays.asList(OUTPUT_DIR + "/src2").iterator()));

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=227583
public void _test020_sourcepath_with_destination() throws IOException {
	StandardJavaFileManager ecjStandardJavaFileManager =
		COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */);
	assertTrue(ecjStandardJavaFileManager.handleOption(
			"-sourcepath", 
			Arrays.asList("\"" + OUTPUT_DIR + "/src2\"[-d \"" + OUTPUT_DIR + "/bin2\"]").iterator()));

			errBuffer = new ByteArrayOutputStream();
	CompilationTask task = COMPILER.getTask(
		new PrintWriter(outBuffer), 
		COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */), 
		new CompilerInvocationDiagnosticListener(new PrintWriter(errBuffer)), 
		Arrays.asList("-v"), null, null);
	assertTrue(task.call());

	System.setErr(new PrintStream(errBuffer));
	CompilationTask task = COMPILER.getTask(
			null, 
			COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */), 
			new CompilerInvocationDiagnosticListener(new PrintWriter(errBuffer)), 
			Arrays.asList("-v"), null, null);
	try {

Lines 1328-1334 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/Main.java (-2 / +5 lines)
1328		1328
1329	private PrintWriter err;	1329	private PrintWriter err;
1330		1330
1331	ArrayList extraProblems;	1331	protected ArrayList extraProblems;
1332	public final static String bundleName = "org.eclipse.jdt.internal.compiler.batch.messages"; //$NON-NLS-1$	1332	public final static String bundleName = "org.eclipse.jdt.internal.compiler.batch.messages"; //$NON-NLS-1$
1333	// two uses: recognize 'none' in options; code the singleton none	1333	// two uses: recognize 'none' in options; code the singleton none
1334	// for the '-d none' option (wherever it may be found)	1334	// for the '-d none' option (wherever it may be found)
Lines 3740-3746 Link Here
3740	}	3740	}
3741		3741
3742	if (this.extraProblems != null) {	3742	if (this.extraProblems != null) {
3743	this.logger.loggingExtraProblems(this);	3743	loggingExtraProblems();
3744	this.extraProblems = null;	3744	this.extraProblems = null;
3745	}	3745	}
3746	if (this.compilerStats != null) {	3746	if (this.compilerStats != null) {
Lines 3751-3756 Link Here
3751	// cleanup	3751	// cleanup
3752	environment.cleanup();	3752	environment.cleanup();
3753	}	3753	}
		3754	protected void loggingExtraProblems() {
		3755	this.logger.loggingExtraProblems(this);
		3756	}
3754	public void printUsage() {	3757	public void printUsage() {
3755	printUsage("misc.usage"); //$NON-NLS-1$	3758	printUsage("misc.usage"); //$NON-NLS-1$
3756	}	3759	}

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java (-2 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 18-24 Link Here
18	public class DefaultProblem extends CategorizedProblem {	18	public class DefaultProblem extends CategorizedProblem {
19	private char[] fileName;	19	private char[] fileName;
20	private int id;	20	private int id;
21	private int startPosition, endPosition, line, column;	21	private int startPosition;
		22	private int endPosition;
		23	private int line;
		24	public int column;
22	private int severity;	25	private int severity;
23	private String[] arguments;	26	private String[] arguments;
24	private String message;	27	private String message;

Return to bug 342936

Lines 1-12 Link Here

(-)src/org/eclipse/jdt/internal/compiler/tool/EclipseCompilerImpl.java (-2 / +78 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2010 IBM Corporation and others.	2	* Copyright (c) 2007, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* IBM Corporation - fix for 342936
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.tool;	12	package org.eclipse.jdt.internal.compiler.tool;
12		13
Lines 17-22 Link Here
17	import java.io.PrintWriter;	18	import java.io.PrintWriter;
18	import java.util.ArrayList;	19	import java.util.ArrayList;
19	import java.util.HashMap;	20	import java.util.HashMap;
		21	import java.util.Iterator;
20	import java.util.Locale;	22	import java.util.Locale;
21	import java.util.Map;	23	import java.util.Map;
22		24
Lines 40-45 Link Here
40	import org.eclipse.jdt.internal.compiler.batch.Main;	42	import org.eclipse.jdt.internal.compiler.batch.Main;
41	import org.eclipse.jdt.internal.compiler.batch.FileSystem.Classpath;	43	import org.eclipse.jdt.internal.compiler.batch.FileSystem.Classpath;
42	import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;	44	import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;
		45	import org.eclipse.jdt.internal.compiler.problem.DefaultProblem;
43	import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;	46	import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
44	import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;	47	import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
45	import org.eclipse.jdt.internal.compiler.util.Messages;	48	import org.eclipse.jdt.internal.compiler.util.Messages;
Lines 481-484 Link Here
481	}	484	}
482	}	485	}
483	}	486	}
		487	@Override
		488	protected void loggingExtraProblems() {
		489	super.loggingExtraProblems();
		490	for (@SuppressWarnings("rawtypes")
		491	Iterator iterator = this.extraProblems.iterator(); iterator.hasNext(); ) {
		492	final CategorizedProblem problem = (CategorizedProblem) iterator.next();
		493	if (this.diagnosticListener != null) {
		494	this.diagnosticListener.report(new Diagnostic<JavaFileObject>() {
		495	@Override
		496	public String getCode() {
		497	return null;
		498	}
		499	@Override
		500	public long getColumnNumber() {
		501	if (problem instanceof DefaultProblem) {
		502	return ((DefaultProblem) problem).column;
		503	}
		504	return Diagnostic.NOPOS;
		505	}
		506	@Override
		507	public long getEndPosition() {
		508	if (problem instanceof DefaultProblem) {
		509	return ((DefaultProblem) problem).getSourceEnd();
		510	}
		511	return Diagnostic.NOPOS;
		512	}
		513	@Override
		514	public Kind getKind() {
		515	if (problem.isError()) {
		516	return Diagnostic.Kind.ERROR;
		517	}
		518	if (problem.isWarning()) {
		519	return Diagnostic.Kind.WARNING;
		520	}
		521	return Diagnostic.Kind.OTHER;
		522	}
		523	@Override
		524	public long getLineNumber() {
		525	if (problem instanceof DefaultProblem) {
		526	return ((DefaultProblem) problem).getSourceLineNumber();
		527	}
		528	return Diagnostic.NOPOS;
		529	}
		530	@Override
		531	public String getMessage(Locale locale) {
		532	return problem.getMessage();
		533	}
		534	@Override
		535	public long getPosition() {
		536	if (problem instanceof DefaultProblem) {
		537	return ((DefaultProblem) problem).getSourceStart();
		538	}
		539	return Diagnostic.NOPOS;
		540	}
		541	@Override
		542	public JavaFileObject getSource() {
		543	if (problem instanceof DefaultProblem) {
		544	File f = new File(new String(((DefaultProblem) problem).getOriginatingFileName()));
		545	if (f.exists()) {
		546	return new EclipseFileObject(null, f.toURI(), JavaFileObject.Kind.SOURCE, null);
		547	}
		548	return null;
		549	}
		550	return null;
551	}
552	@Override
553	public long getStartPosition() {
554	return getPosition();
555	}
556	});
557	}
558	}
559	}
484	}	560	}

Lines 1-12 Link Here

(-)src/org/eclipse/jdt/compiler/tool/tests/AbstractCompilerToolTest.java (-3 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2010 IBM Corporation and others.	2	* Copyright (c) 2008, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* IBM Corporation - fix for 342936
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.compiler.tool.tests;	12	package org.eclipse.jdt.compiler.tool.tests;
12		13
Lines 95-101 Link Here
95	CompilerInvocationTestsArguments arguments = (CompilerInvocationTestsArguments) extraArguments;	96	CompilerInvocationTestsArguments arguments = (CompilerInvocationTestsArguments) extraArguments;
96	StandardJavaFileManager manager = arguments.standardJavaFileManager;	97	StandardJavaFileManager manager = arguments.standardJavaFileManager;
97	if (manager == null) {	98	if (manager == null) {
98	manager = JAVAC_COMPILER.getStandardFileManager(null, null, null); // will pick defaults up	99	manager = COMPILER.getStandardFileManager(null, null, null); // will pick defaults up
99	}	100	}
100	List<File> files = new ArrayList<File>();	101	List<File> files = new ArrayList<File>();
101	String[] fileNames = arguments.fileNames;	102	String[] fileNames = arguments.fileNames;