Fixed versionmatching for our test framework.

2 files changed, 5 insertions, 4 deletions

diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java
index d044a39f..934c74c0 100644
--- a/test/core/src/lombok/AbstractRunTests.java
+++ b/test/core/src/lombok/AbstractRunTests.java
@@ -55,7 +55,7 @@ public abstract class AbstractRunTests {
 		this.dumpActualFilesHere = findPlaceToDumpActualFiles();
 	}
 	
-	public final FileTester createTester(final DirectoryRunner.TestParams params, final File file) throws IOException {
+	public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, int version) throws IOException {
 		ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys();
 		AssertionError directiveFailure = null;
 		LombokTestSource sourceDirectives = null;
@@ -64,6 +64,7 @@ public abstract class AbstractRunTests {
 			if (sourceDirectives.isIgnore()) return null;
 			if (!sourceDirectives.versionWithinLimit(params.getVersion())) return null;
 			if (!sourceDirectives.versionWithinLimit(getClasspathVersion())) return null;
+			if (!sourceDirectives.versionWithinLimit(version)) return null;
 		} catch (AssertionError ae) {
 			directiveFailure = ae;
 		}
@@ -73,6 +74,7 @@ public abstract class AbstractRunTests {
 		
 		if (expected.isIgnore()) return null;
 		if (!expected.versionWithinLimit(params.getVersion())) return null;
+		if (!expected.versionWithinLimit(version)) return null;
 		
 		final LombokTestSource sourceDirectives_ = sourceDirectives;
 		final AssertionError directiveFailure_ = directiveFailure;
diff --git a/test/core/src/lombok/DirectoryRunner.java b/test/core/src/lombok/DirectoryRunner.java
index d4275b09..c9a5de31 100644
--- a/test/core/src/lombok/DirectoryRunner.java
+++ b/test/core/src/lombok/DirectoryRunner.java
@@ -155,12 +155,11 @@ public class DirectoryRunner extends Runner {
 	
 	private FileTester createTester(String fileName) throws IOException {
 		File file = new File(params.getBeforeDirectory(), fileName);
-		
 		switch (params.getCompiler()) {
 		case DELOMBOK:
-			return new RunTestsViaDelombok().createTester(params, file);
+			return new RunTestsViaDelombok().createTester(params, file, params.getVersion());
 		case ECJ:
-			return new RunTestsViaEcj().createTester(params, file);
+			return new RunTestsViaEcj().createTester(params, file, params.getVersion());
 		default:
 		case JAVAC:
 			throw new UnsupportedOperationException();