Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 12 insertions, 9 deletions

diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java
index a3f52cdd..2f3f0988 100644
--- a/test/core/src/lombok/AbstractRunTests.java
+++ b/test/core/src/lombok/AbstractRunTests.java
@@ -43,7 +43,6 @@ import java.util.List;
 import lombok.javac.CapturingDiagnosticListener.CompilerMessage;
 
 public abstract class AbstractRunTests {
-	protected static final String LINE_SEPARATOR = System.getProperty("line.separator");
 	private final File dumpActualFilesHere;
 	
 	public AbstractRunTests() {
@@ -69,10 +68,12 @@ public abstract class AbstractRunTests {
 			}
 		}
 		
-		StringReader r = new StringReader(expectedFile);
-		BufferedReader br = new BufferedReader(r);
-		String firstLine = br.readLine();
-		if (firstLine != null && firstLine.startsWith("//ignore")) return false;
+		if (expectedFile != null) {
+			StringReader r = new StringReader(expectedFile);
+			BufferedReader br = new BufferedReader(r);
+			String firstLine = br.readLine();
+			if (firstLine != null && (firstLine.startsWith("//ignore") || params.shouldIgnoreBasedOnVersion(firstLine))) return false;
+		}
 		
 		compare(
 				file.getName(),
@@ -92,20 +93,20 @@ public abstract class AbstractRunTests {
 		try {
 			reader = new BufferedReader(new FileReader(file));
 		} catch (FileNotFoundException e) {
-			return "";
+			return null;
 		}
 		StringBuilder result = new StringBuilder();
 		String line;
 		while ((line = reader.readLine()) != null) {
 			result.append(line);
-			result.append(LINE_SEPARATOR);
+			result.append("\n");
 		}
 		reader.close();
 		return result.toString();
 	}
 	
 	private String readFile(File dir, File file, boolean messages) throws IOException {
-		if (dir == null) return "";
+		if (dir == null) return null;
 		return readFile(new File(dir, file.getName() + (messages ? ".messages" : "")));
 	}
 	
@@ -141,7 +142,9 @@ public abstract class AbstractRunTests {
 	}
 	
 	private void compare(String name, String expectedFile, String actualFile, List<CompilerMessageMatcher> expectedMessages, LinkedHashSet<CompilerMessage> actualMessages, boolean printErrors) throws Throwable {
-		try {
+		if (expectedFile == null && expectedMessages.isEmpty()) expectedFile = "";
+		
+		if (expectedFile != null) try {
 			compareContent(name, expectedFile, actualFile);
 		} catch (Throwable e) {
 			if (printErrors) {