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

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java (-8 / +12 lines)
Lines 830-837 Link Here
830
	abstract String expected(); // for use in JUnit comparison framework
830
	abstract String expected(); // for use in JUnit comparison framework
831
}
831
}
832
static class StringMatcher extends Matcher {
832
static class StringMatcher extends Matcher {
833
	private String expected;
833
	private final String expected;
834
	private Normalizer normalizer;
834
	private final Normalizer normalizer;
835
	StringMatcher(String expected, Normalizer normalizer) {
835
	StringMatcher(String expected, Normalizer normalizer) {
836
		this.expected = expected;
836
		this.expected = expected;
837
		this.normalizer = normalizer;
837
		this.normalizer = normalizer;
Lines 850-856 Link Here
850
	}
850
	}
851
}
851
}
852
static class SubstringMatcher extends Matcher {
852
static class SubstringMatcher extends Matcher {
853
	private String substring;
853
	private final String substring;
854
	SubstringMatcher(String substring) {
854
	SubstringMatcher(String substring) {
855
		this.substring = substring;
855
		this.substring = substring;
856
	}
856
	}
Lines 878-884 Link Here
878
	 * here, that is {@link #normalized(String) normalized}.
878
	 * here, that is {@link #normalized(String) normalized}.
879
	 */
879
	 */
880
	private static abstract class Normalizer {
880
	private static abstract class Normalizer {
881
		private Normalizer nextInChain;
881
		private final Normalizer nextInChain;
882
		Normalizer(Normalizer nextInChain) {
882
		Normalizer(Normalizer nextInChain) {
883
			this.nextInChain = nextInChain;
883
			this.nextInChain = nextInChain;
884
		}
884
		}
Lines 897-905 Link Here
897
	 * placeholder.
897
	 * placeholder.
898
	 */
898
	 */
899
	private static class StringNormalizer extends Normalizer {
899
	private static class StringNormalizer extends Normalizer {
900
		private String match;
900
		private final String match;
901
		private int matchLength;
901
		private final int matchLength;
902
		private String placeholder;
902
		private final String placeholder;
903
		StringNormalizer(Normalizer nextInChain, String match, String placeholder) {
903
		StringNormalizer(Normalizer nextInChain, String match, String placeholder) {
904
			super(nextInChain);
904
			super(nextInChain);
905
			this.match = match;
905
			this.match = match;
Lines 973-979 Link Here
973
	 * This normalizer removes a selected range of lines from a log file.
973
	 * This normalizer removes a selected range of lines from a log file.
974
	 */
974
	 */
975
	private static class LinesRangeNormalizer extends Normalizer {
975
	private static class LinesRangeNormalizer extends Normalizer {
976
		private int first, number;
976
		private final int first;
977
		private int number;
977
978
978
		LinesRangeNormalizer() {
979
		LinesRangeNormalizer() {
979
			super(null);
980
			super(null);
Lines 3851-3856 Link Here
3851
// code)
3852
// code)
3852
// this test only works on appropriate file systems
3853
// this test only works on appropriate file systems
3853
public void test055(){
3854
public void test055(){
3855
	String os= System.getProperty("os.name");
3856
    if (!os.startsWith("Windows")) // https://bugs.eclipse.org/bugs/show_bug.cgi?id=316827
3857
    	return;
3854
	if (File.separatorChar == '/') {
3858
	if (File.separatorChar == '/') {
3855
	  	String tentativeOutputDirNameTail =
3859
	  	String tentativeOutputDirNameTail =
3856
	      	File.separator + "out";
3860
	      	File.separator + "out";

Return to bug 316827