ecj tests and eclipse tests are now effectively doing the same thing, except the ecj tests are written in a slightly more close-to-reality way, and do work for 'val'. eclipse test aspect removed.

3 files changed, 7 insertions, 62 deletions

diff --git a/test/transform/src/lombok/transform/RunTransformTests.java b/test/transform/src/lombok/transform/RunTransformTests.java
index 2e644342..0afbc5d6 100644
--- a/test/transform/src/lombok/transform/RunTransformTests.java
+++ b/test/transform/src/lombok/transform/RunTransformTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 The Project Lombok Authors.
+ * Copyright (C) 2011-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,6 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({TestLombokFilesIdempotent.class, TestSourceFiles.class, TestWithDelombok.class, TestWithEcj.class, TestWithEclipse.class})
+@SuiteClasses({TestLombokFilesIdempotent.class, TestSourceFiles.class, TestWithDelombok.class, TestWithEcj.class})
 public class RunTransformTests {
 }
diff --git a/test/transform/src/lombok/transform/TestWithEcj.java b/test/transform/src/lombok/transform/TestWithEcj.java
index 035aed54..9463b531 100644
--- a/test/transform/src/lombok/transform/TestWithEcj.java
+++ b/test/transform/src/lombok/transform/TestWithEcj.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 The Project Lombok Authors.
+ * Copyright (C) 2009-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,10 @@ import lombok.DirectoryRunner;
 
 import org.junit.runner.RunWith;
 
+// You need to add the following vm-parameter to run the test:
+// -javaagent:${project_loc:lombok}/dist/lombok.jar
+// When running inside eclipse's junit tester, you don't actually need to run 'ant dist' after updating code, though.
+
 @RunWith(DirectoryRunner.class)
 public class TestWithEcj implements DirectoryRunner.TestParams {
 	@Override
diff --git a/test/transform/src/lombok/transform/TestWithEclipse.java b/test/transform/src/lombok/transform/TestWithEclipse.java
deleted file mode 100644
index 4b145329..00000000
--- a/test/transform/src/lombok/transform/TestWithEclipse.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2011 The Project Lombok Authors.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.transform;
-
-import java.io.File;
-
-import lombok.DirectoryRunner;
-
-import org.junit.runner.RunWith;
-
-// For now you need to add the following vm-parameter to run the test:
-// -javaagent:${project_loc:lombok}/dist/lombok.jar
-
-@RunWith(DirectoryRunner.class)
-public class TestWithEclipse implements DirectoryRunner.TestParams {
-	@Override
-	public DirectoryRunner.Compiler getCompiler() {
-		return DirectoryRunner.Compiler.ECLIPSE;
-	}
-	
-	@Override
-	public boolean printErrors() {
-		return true;
-	}
-	
-	@Override
-	public File getBeforeDirectory() {
-		return new File("test/transform/resource/before");
-	}
-	
-	@Override
-	public File getAfterDirectory() {
-		return new File("test/transform/resource/after-eclipse");
-	}
-	
-	@Override
-	public File getMessagesDirectory() {
-		return new File("test/transform/resource/messages-eclipse");
-	}
-}