Attachment #47927 for bug #152725




	private long time;
	
	static {
//		TESTS_NUMBERS = new int[] { 622 } ;
	}
	public static Test suite() {
		return buildModelTestSuite(FormatterRegressionTests.class);

			JavaCore.setOptions(javaCoreOptions);
		}
	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=152725
	public void test622() {
		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		Hashtable javaCoreOptions = JavaCore.getOptions();
		try {
			Hashtable newJavaCoreOptions = JavaCore.getOptions();
			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
			JavaCore.setOptions(newJavaCoreOptions);
		
			Map compilerOptions = new HashMap();
			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);		
			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
			runTest(codeFormatter, "test622", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
		} finally {
			JavaCore.setOptions(javaCoreOptions);
		}
	}	
}

Added Link Here

(-)workspace/Formatter/test622/A_out.java (+6 lines)
1	public enum Enum_16 {
2	ONE, TWO, THREE;
3	String foo(String str) {
4	return "";
5	}
6	}

Added Link Here

(-)workspace/Formatter/test622/A_in.java (+4 lines)
1	public enum Enum_16 {
2	ONE,TWO,THREE;
3	String foo(String str){return"";}
4	}

Return to bug 152725

Lines 54-60 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java (-1 / +23 lines)
54	private long time;	54	private long time;
55		55
56	static {	56	static {
57	// TESTS_NUMBERS = new int[] { 620 } ;	57	// TESTS_NUMBERS = new int[] { 622 } ;
58	}	58	}
59	public static Test suite() {	59	public static Test suite() {
60	return buildModelTestSuite(FormatterRegressionTests.class);	60	return buildModelTestSuite(FormatterRegressionTests.class);
Lines 8808-8811 Link Here
8808	JavaCore.setOptions(javaCoreOptions);	8808	JavaCore.setOptions(javaCoreOptions);
8809	}	8809	}
8810	}	8810	}
		8811	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=152725
		8812	public void test622() {
		8813	Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		8814	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		8815	Hashtable javaCoreOptions = JavaCore.getOptions();
		8816	try {
		8817	Hashtable newJavaCoreOptions = JavaCore.getOptions();
		8818	newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
		8819	newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
		8820	newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
		8821	JavaCore.setOptions(newJavaCoreOptions);
		8822
		8823	Map compilerOptions = new HashMap();
		8824	compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
		8825	compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
		8826	compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
		8827	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
		8828	runTest(codeFormatter, "test622", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
		8829	} finally {
		8830	JavaCore.setOptions(javaCoreOptions);
		8831	}
		8832	}
8811	}	8833	}