View | Details | Raw Unified | Return to bug 148370 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java (-1 / +67 lines)
Lines 54-60 Link Here
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[] { 624 } ;
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=148370
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_5);
8819 
			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
8820 
			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
8821 
			JavaCore.setOptions(newJavaCoreOptions);
8822
8823 
			Map compilerOptions = new HashMap();
8824 
			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
8825 
			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
8826 
			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
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 
	}
8833 
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370
8834 
	public void test623() {
8835 
		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
8836 
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
8837 
		Hashtable javaCoreOptions = JavaCore.getOptions();
8838 
		try {
8839 
			Hashtable newJavaCoreOptions = JavaCore.getOptions();
8840 
			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
8841 
			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
8842 
			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
8843 
			JavaCore.setOptions(newJavaCoreOptions);
8844
8845 
			Map compilerOptions = new HashMap();
8846 
			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
8847 
			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
8848 
			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
8849 
			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
8850 
			runTest(codeFormatter, "test623", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
8851 
		} finally {
8852 
			JavaCore.setOptions(javaCoreOptions);
8853 
		}
8854 
	}
8855 
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370
8856 
	public void test624() {
8857 
		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
8858 
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
8859 
		Hashtable javaCoreOptions = JavaCore.getOptions();
8860 
		try {
8861 
			Hashtable newJavaCoreOptions = JavaCore.getOptions();
8862 
			newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
8863 
			newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
8864 
			newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
8865 
			JavaCore.setOptions(newJavaCoreOptions);
8866
8867 
			Map compilerOptions = new HashMap();
8868 
			compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
8869 
			compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
8870 
			compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
8871 
			DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
8872 
			runTest(codeFormatter, "test624", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
8873 
		} finally {
8874 
			JavaCore.setOptions(javaCoreOptions);
8875 
		}
8876 
	}
8811 
}
 8877 
}
(-)workspace/Formatter/test624/A_out.java (+3 lines)
Added Link Here
1 
class X {
2 
	Object classes = new Class<?>[][0];
3 
}
(-)workspace/Formatter/test623/A_in.java (+5 lines)
Added Link Here
1 
class X
2 
{
3 
Object
4 
classes = new Class<?>[0];
5 
}
(-)workspace/Formatter/test622/A_out.java (+3 lines)
Added Link Here
1 
class X {
2 
	Object classes = new Class<?>[] {};
3 
}
(-)workspace/Formatter/test624/A_in.java (+5 lines)
Added Link Here
1 
class X
2 
{
3 
Object
4 
classes = new Class<?>[][0];
5 
}
(-)workspace/Formatter/test622/A_in.java (+5 lines)
Added Link Here
1 
class X
2 
{
3 
Object
4 
classes = new Class<?>[] {};
5 
}
(-)workspace/Formatter/test623/A_out.java (+3 lines)
Added Link Here
1 
class X {
2 
	Object classes = new Class<?>[0];
3 
}

Return to bug 148370