From 59e585a0c68959eb72be34524bdad19df5dc8a4d Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 21 Jul 2010 23:52:28 +0200 Subject: refactored the tests to prepare running ecj as well as delombok. --- build.xml | 8 +- test/core/src/lombok/AbstractRunTests.java | 136 ++++++++++++++++++++ test/core/src/lombok/DirectoryRunner.java | 72 ++++++++--- test/core/src/lombok/RunTestsViaDelombok.java | 128 ++----------------- test/core/src/lombok/RunTestsViaEcj.java | 56 +++++++++ .../resource/after/ClassNamedAfterGetter.java | 7 -- test/delombok/resource/after/CleanupName.java | 18 --- test/delombok/resource/after/CleanupPlain.java | 18 --- .../resource/after/CommentsInterspersed.java | 16 --- test/delombok/resource/after/DataIgnore.java | 36 ------ test/delombok/resource/after/DataPlain.java | 92 -------------- .../delombok/resource/after/GetterAccessLevel.java | 49 -------- .../resource/after/GetterAlreadyExists.java | 140 --------------------- test/delombok/resource/after/GetterBoolean.java | 23 ---- test/delombok/resource/after/GetterOnClass.java | 59 --------- test/delombok/resource/after/GetterPlain.java | 12 -- test/delombok/resource/after/GetterWithDollar.java | 15 --- test/delombok/resource/after/NonNullPlain.java | 25 ---- .../delombok/resource/after/SetterAccessLevel.java | 28 ----- .../resource/after/SetterAlreadyExists.java | 35 ------ test/delombok/resource/after/SetterOnClass.java | 59 --------- test/delombok/resource/after/SetterPlain.java | 12 -- test/delombok/resource/after/SetterWithDollar.java | 15 --- .../resource/after/SneakyThrowsMultiple.java | 45 ------- .../delombok/resource/after/SneakyThrowsPlain.java | 17 --- .../resource/after/SneakyThrowsSingle.java | 26 ---- test/delombok/resource/after/SynchronizedName.java | 25 ---- .../delombok/resource/after/SynchronizedPlain.java | 28 ----- test/delombok/resource/after/ToStringInner.java | 32 ----- test/delombok/resource/after/ToStringPlain.java | 18 --- .../resource/before/ClassNamedAfterGetter.java | 3 - test/delombok/resource/before/CleanupName.java | 10 -- test/delombok/resource/before/CleanupPlain.java | 11 -- .../resource/before/CommentsInterspersed.java | 17 --- test/delombok/resource/before/DataIgnore.java | 4 - test/delombok/resource/before/DataPlain.java | 9 -- .../resource/before/GetterAccessLevel.java | 24 ---- .../resource/before/GetterAlreadyExists.java | 108 ---------------- .../before/GetterAlreadyExists.java.messages | 10 -- test/delombok/resource/before/GetterBoolean.java | 12 -- .../resource/before/GetterBoolean.java.messages | 1 - test/delombok/resource/before/GetterOnClass.java | 37 ------ test/delombok/resource/before/GetterPlain.java | 5 - .../delombok/resource/before/GetterWithDollar.java | 9 -- test/delombok/resource/before/NonNullPlain.java | 11 -- .../resource/before/SetterAccessLevel.java | 14 --- .../resource/before/SetterAlreadyExists.java | 35 ------ .../before/SetterAlreadyExists.java.messages | 7 -- test/delombok/resource/before/SetterOnClass.java | 37 ------ test/delombok/resource/before/SetterPlain.java | 5 - .../delombok/resource/before/SetterWithDollar.java | 9 -- .../resource/before/SneakyThrowsMultiple.java | 28 ----- .../resource/before/SneakyThrowsPlain.java | 10 -- .../resource/before/SneakyThrowsSingle.java | 21 ---- .../delombok/resource/before/SynchronizedName.java | 21 ---- .../resource/before/SynchronizedPlain.java | 17 --- test/delombok/resource/before/ToStringInner.java | 17 --- test/delombok/resource/before/ToStringPlain.java | 9 -- .../src/lombok/delombok/TestLombokFiles.java | 42 ------- .../lombok/delombok/TestLombokFilesIdempotent.java | 42 ------- .../src/lombok/delombok/TestSourceFiles.java | 41 ------ .../after-delombok/ClassNamedAfterGetter.java | 7 ++ .../resource/after-delombok/CleanupName.java | 18 +++ .../resource/after-delombok/CleanupPlain.java | 18 +++ .../after-delombok/CommentsInterspersed.java | 16 +++ .../resource/after-delombok/DataExtended.java | 37 ++++++ .../resource/after-delombok/DataIgnore.java | 36 ++++++ .../resource/after-delombok/DataPlain.java | 92 ++++++++++++++ .../resource/after-delombok/GetterAccessLevel.java | 49 ++++++++ .../after-delombok/GetterAlreadyExists.java | 140 +++++++++++++++++++++ .../resource/after-delombok/GetterBoolean.java | 23 ++++ .../resource/after-delombok/GetterOnClass.java | 59 +++++++++ .../resource/after-delombok/GetterPlain.java | 12 ++ .../resource/after-delombok/GetterWithDollar.java | 15 +++ .../resource/after-delombok/NonNullPlain.java | 25 ++++ .../resource/after-delombok/SetterAccessLevel.java | 28 +++++ .../after-delombok/SetterAlreadyExists.java | 35 ++++++ .../resource/after-delombok/SetterOnClass.java | 59 +++++++++ .../resource/after-delombok/SetterPlain.java | 12 ++ .../resource/after-delombok/SetterWithDollar.java | 15 +++ .../after-delombok/SneakyThrowsMultiple.java | 45 +++++++ .../resource/after-delombok/SneakyThrowsPlain.java | 17 +++ .../after-delombok/SneakyThrowsSingle.java | 26 ++++ .../resource/after-delombok/SynchronizedName.java | 25 ++++ .../resource/after-delombok/SynchronizedPlain.java | 28 +++++ .../resource/after-delombok/ToStringInner.java | 36 ++++++ .../resource/after-delombok/ToStringPlain.java | 18 +++ .../resource/before/ClassNamedAfterGetter.java | 3 + test/transform/resource/before/CleanupName.java | 10 ++ test/transform/resource/before/CleanupPlain.java | 11 ++ .../resource/before/CommentsInterspersed.java | 17 +++ test/transform/resource/before/DataExtended.java | 5 + test/transform/resource/before/DataIgnore.java | 4 + test/transform/resource/before/DataPlain.java | 9 ++ .../resource/before/GetterAccessLevel.java | 24 ++++ .../resource/before/GetterAlreadyExists.java | 108 ++++++++++++++++ test/transform/resource/before/GetterBoolean.java | 12 ++ test/transform/resource/before/GetterOnClass.java | 37 ++++++ test/transform/resource/before/GetterPlain.java | 5 + .../resource/before/GetterWithDollar.java | 9 ++ test/transform/resource/before/NonNullPlain.java | 11 ++ .../resource/before/SetterAccessLevel.java | 14 +++ .../resource/before/SetterAlreadyExists.java | 35 ++++++ test/transform/resource/before/SetterOnClass.java | 37 ++++++ test/transform/resource/before/SetterPlain.java | 5 + .../resource/before/SetterWithDollar.java | 9 ++ .../resource/before/SneakyThrowsMultiple.java | 28 +++++ .../resource/before/SneakyThrowsPlain.java | 10 ++ .../resource/before/SneakyThrowsSingle.java | 21 ++++ .../resource/before/SynchronizedName.java | 21 ++++ .../resource/before/SynchronizedPlain.java | 17 +++ test/transform/resource/before/ToStringInner.java | 16 +++ test/transform/resource/before/ToStringPlain.java | 9 ++ .../GetterAlreadyExists.java.messages | 10 ++ .../messages-delombok/GetterBoolean.java.messages | 1 + .../SetterAlreadyExists.java.messages | 7 ++ .../transform/TestLombokFilesIdempotent.java | 56 +++++++++ .../src/lombok/transform/TestSourceFiles.java | 52 ++++++++ .../src/lombok/transform/TestWithDelombok.java | 56 +++++++++ 119 files changed, 1818 insertions(+), 1618 deletions(-) create mode 100644 test/core/src/lombok/AbstractRunTests.java create mode 100644 test/core/src/lombok/RunTestsViaEcj.java delete mode 100644 test/delombok/resource/after/ClassNamedAfterGetter.java delete mode 100644 test/delombok/resource/after/CleanupName.java delete mode 100644 test/delombok/resource/after/CleanupPlain.java delete mode 100644 test/delombok/resource/after/CommentsInterspersed.java delete mode 100644 test/delombok/resource/after/DataIgnore.java delete mode 100644 test/delombok/resource/after/DataPlain.java delete mode 100644 test/delombok/resource/after/GetterAccessLevel.java delete mode 100644 test/delombok/resource/after/GetterAlreadyExists.java delete mode 100644 test/delombok/resource/after/GetterBoolean.java delete mode 100644 test/delombok/resource/after/GetterOnClass.java delete mode 100644 test/delombok/resource/after/GetterPlain.java delete mode 100644 test/delombok/resource/after/GetterWithDollar.java delete mode 100644 test/delombok/resource/after/NonNullPlain.java delete mode 100644 test/delombok/resource/after/SetterAccessLevel.java delete mode 100644 test/delombok/resource/after/SetterAlreadyExists.java delete mode 100644 test/delombok/resource/after/SetterOnClass.java delete mode 100644 test/delombok/resource/after/SetterPlain.java delete mode 100644 test/delombok/resource/after/SetterWithDollar.java delete mode 100644 test/delombok/resource/after/SneakyThrowsMultiple.java delete mode 100644 test/delombok/resource/after/SneakyThrowsPlain.java delete mode 100644 test/delombok/resource/after/SneakyThrowsSingle.java delete mode 100644 test/delombok/resource/after/SynchronizedName.java delete mode 100644 test/delombok/resource/after/SynchronizedPlain.java delete mode 100644 test/delombok/resource/after/ToStringInner.java delete mode 100644 test/delombok/resource/after/ToStringPlain.java delete mode 100644 test/delombok/resource/before/ClassNamedAfterGetter.java delete mode 100644 test/delombok/resource/before/CleanupName.java delete mode 100644 test/delombok/resource/before/CleanupPlain.java delete mode 100644 test/delombok/resource/before/CommentsInterspersed.java delete mode 100644 test/delombok/resource/before/DataIgnore.java delete mode 100644 test/delombok/resource/before/DataPlain.java delete mode 100644 test/delombok/resource/before/GetterAccessLevel.java delete mode 100644 test/delombok/resource/before/GetterAlreadyExists.java delete mode 100644 test/delombok/resource/before/GetterAlreadyExists.java.messages delete mode 100644 test/delombok/resource/before/GetterBoolean.java delete mode 100644 test/delombok/resource/before/GetterBoolean.java.messages delete mode 100644 test/delombok/resource/before/GetterOnClass.java delete mode 100644 test/delombok/resource/before/GetterPlain.java delete mode 100644 test/delombok/resource/before/GetterWithDollar.java delete mode 100644 test/delombok/resource/before/NonNullPlain.java delete mode 100644 test/delombok/resource/before/SetterAccessLevel.java delete mode 100644 test/delombok/resource/before/SetterAlreadyExists.java delete mode 100644 test/delombok/resource/before/SetterAlreadyExists.java.messages delete mode 100644 test/delombok/resource/before/SetterOnClass.java delete mode 100644 test/delombok/resource/before/SetterPlain.java delete mode 100644 test/delombok/resource/before/SetterWithDollar.java delete mode 100644 test/delombok/resource/before/SneakyThrowsMultiple.java delete mode 100644 test/delombok/resource/before/SneakyThrowsPlain.java delete mode 100644 test/delombok/resource/before/SneakyThrowsSingle.java delete mode 100644 test/delombok/resource/before/SynchronizedName.java delete mode 100644 test/delombok/resource/before/SynchronizedPlain.java delete mode 100644 test/delombok/resource/before/ToStringInner.java delete mode 100644 test/delombok/resource/before/ToStringPlain.java delete mode 100644 test/delombok/src/lombok/delombok/TestLombokFiles.java delete mode 100644 test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java delete mode 100644 test/delombok/src/lombok/delombok/TestSourceFiles.java create mode 100644 test/transform/resource/after-delombok/ClassNamedAfterGetter.java create mode 100644 test/transform/resource/after-delombok/CleanupName.java create mode 100644 test/transform/resource/after-delombok/CleanupPlain.java create mode 100644 test/transform/resource/after-delombok/CommentsInterspersed.java create mode 100644 test/transform/resource/after-delombok/DataExtended.java create mode 100644 test/transform/resource/after-delombok/DataIgnore.java create mode 100644 test/transform/resource/after-delombok/DataPlain.java create mode 100644 test/transform/resource/after-delombok/GetterAccessLevel.java create mode 100644 test/transform/resource/after-delombok/GetterAlreadyExists.java create mode 100644 test/transform/resource/after-delombok/GetterBoolean.java create mode 100644 test/transform/resource/after-delombok/GetterOnClass.java create mode 100644 test/transform/resource/after-delombok/GetterPlain.java create mode 100644 test/transform/resource/after-delombok/GetterWithDollar.java create mode 100644 test/transform/resource/after-delombok/NonNullPlain.java create mode 100644 test/transform/resource/after-delombok/SetterAccessLevel.java create mode 100644 test/transform/resource/after-delombok/SetterAlreadyExists.java create mode 100644 test/transform/resource/after-delombok/SetterOnClass.java create mode 100644 test/transform/resource/after-delombok/SetterPlain.java create mode 100644 test/transform/resource/after-delombok/SetterWithDollar.java create mode 100644 test/transform/resource/after-delombok/SneakyThrowsMultiple.java create mode 100644 test/transform/resource/after-delombok/SneakyThrowsPlain.java create mode 100644 test/transform/resource/after-delombok/SneakyThrowsSingle.java create mode 100644 test/transform/resource/after-delombok/SynchronizedName.java create mode 100644 test/transform/resource/after-delombok/SynchronizedPlain.java create mode 100644 test/transform/resource/after-delombok/ToStringInner.java create mode 100644 test/transform/resource/after-delombok/ToStringPlain.java create mode 100644 test/transform/resource/before/ClassNamedAfterGetter.java create mode 100644 test/transform/resource/before/CleanupName.java create mode 100644 test/transform/resource/before/CleanupPlain.java create mode 100644 test/transform/resource/before/CommentsInterspersed.java create mode 100644 test/transform/resource/before/DataExtended.java create mode 100644 test/transform/resource/before/DataIgnore.java create mode 100644 test/transform/resource/before/DataPlain.java create mode 100644 test/transform/resource/before/GetterAccessLevel.java create mode 100644 test/transform/resource/before/GetterAlreadyExists.java create mode 100644 test/transform/resource/before/GetterBoolean.java create mode 100644 test/transform/resource/before/GetterOnClass.java create mode 100644 test/transform/resource/before/GetterPlain.java create mode 100644 test/transform/resource/before/GetterWithDollar.java create mode 100644 test/transform/resource/before/NonNullPlain.java create mode 100644 test/transform/resource/before/SetterAccessLevel.java create mode 100644 test/transform/resource/before/SetterAlreadyExists.java create mode 100644 test/transform/resource/before/SetterOnClass.java create mode 100644 test/transform/resource/before/SetterPlain.java create mode 100644 test/transform/resource/before/SetterWithDollar.java create mode 100644 test/transform/resource/before/SneakyThrowsMultiple.java create mode 100644 test/transform/resource/before/SneakyThrowsPlain.java create mode 100644 test/transform/resource/before/SneakyThrowsSingle.java create mode 100644 test/transform/resource/before/SynchronizedName.java create mode 100644 test/transform/resource/before/SynchronizedPlain.java create mode 100644 test/transform/resource/before/ToStringInner.java create mode 100644 test/transform/resource/before/ToStringPlain.java create mode 100644 test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages create mode 100644 test/transform/resource/messages-delombok/GetterBoolean.java.messages create mode 100644 test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages create mode 100644 test/transform/src/lombok/transform/TestLombokFilesIdempotent.java create mode 100644 test/transform/src/lombok/transform/TestSourceFiles.java create mode 100644 test/transform/src/lombok/transform/TestWithDelombok.java diff --git a/build.xml b/build.xml index e7b14761..1c0562b9 100644 --- a/build.xml +++ b/build.xml @@ -168,7 +168,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + @@ -206,11 +206,11 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + - + @@ -224,7 +224,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java new file mode 100644 index 00000000..ad9c45af --- /dev/null +++ b/test/core/src/lombok/AbstractRunTests.java @@ -0,0 +1,136 @@ +/* + * Copyright © 2009-2010 Reinier Zwitserloot and Roel Spilker. + * + * 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; + +import static org.junit.Assert.*; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +public abstract class AbstractRunTests { + protected static final String LINE_SEPARATOR = System.getProperty("line.separator"); + + public void compareFile(DirectoryRunner.TestParams params, File file) throws Throwable { + StringBuilder messages = new StringBuilder(); + StringWriter result = new StringWriter(); + transformCode(messages, result, file); + compare( + file.getName(), + readFile(params.getAfterDirectory(), file, false), + result.toString(), + readFile(params.getMessagesDirectory(), file, true), + messages.toString(), + params.printErrors()); + } + + protected abstract void transformCode(StringBuilder message, StringWriter result, File file) throws Throwable; + + protected String readFile(File file) throws IOException { + BufferedReader reader; + try { + reader = new BufferedReader(new FileReader(file)); + } catch (FileNotFoundException e) { + return ""; + } + StringBuilder result = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + result.append(line); + result.append(LINE_SEPARATOR); + } + reader.close(); + return result.toString(); + } + + private String readFile(File dir, File file, boolean messages) throws IOException { + if (dir == null) return ""; + return readFile(new File(dir, file.getName() + (messages ? ".messages" : ""))); + } + + private void compare(String name, String expectedFile, String actualFile, String expectedMessages, String actualMessages, boolean printErrors) throws Throwable { + try { + compareContent(name, expectedFile, actualFile); + } catch (Throwable e) { + if (printErrors) { + System.out.println("***** " + name + " *****"); + System.out.println(e.getMessage()); + System.out.println("**** Expected ******"); + System.out.println(expectedFile); + System.out.println("**** Actual ******"); + System.out.println(actualFile); + System.out.println("*******************"); + } + throw e; + } + try { + compareContent(name, expectedMessages, actualMessages); + } + catch (Throwable e) { + if (printErrors) { + System.out.println("***** " + name + " *****"); + System.out.println(e.getMessage()); + System.out.println("**** Expected ******"); + System.out.println(expectedMessages); + System.out.println("**** Actual ******"); + System.out.println(actualMessages); + System.out.println("*******************"); + } + throw e; + } + } + + private static void compareContent(String name, String expectedFile, String actualFile) { + String[] expectedLines = expectedFile.split("(\\r?\\n)"); + String[] actualLines = actualFile.split("(\\r?\\n)"); + if (actualLines[0].startsWith("// Generated by delombok at ")) { + actualLines[0] = ""; + } + expectedLines = removeBlanks(expectedLines); + actualLines = removeBlanks(actualLines); + int size = Math.min(expectedLines.length, actualLines.length); + for (int i = 0; i < size; i++) { + String expected = expectedLines[i]; + String actual = actualLines[i]; + assertEquals(String.format("Difference in %s on line %d", name, i + 1), expected, actual); + } + if (expectedLines.length > actualLines.length) { + fail(String.format("Missing line %d in generated %s: %s", size + 1, name, expectedLines[size])); + } + if (expectedLines.length < actualLines.length) { + fail(String.format("Extra line %d in generated %s: %s", size + 1, name, actualLines[size])); + } + } + + private static String[] removeBlanks(String[] in) { + List out = new ArrayList(); + for (String s : in) { + if (!s.trim().isEmpty()) out.add(s); + } + return out.toArray(new String[0]); + } +} diff --git a/test/core/src/lombok/DirectoryRunner.java b/test/core/src/lombok/DirectoryRunner.java index db474ff0..89fe6ab0 100644 --- a/test/core/src/lombok/DirectoryRunner.java +++ b/test/core/src/lombok/DirectoryRunner.java @@ -1,3 +1,24 @@ +/* + * Copyright © 2009-2010 Reinier Zwitserloot and Roel Spilker. + * + * 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; import java.io.BufferedReader; @@ -6,7 +27,6 @@ import java.io.FileFilter; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.lang.reflect.Method; import java.util.Map; import java.util.TreeMap; @@ -16,6 +36,17 @@ import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; public class DirectoryRunner extends Runner { + public enum Compiler { + DELOMBOK, JAVAC, ECJ; + } + + public interface TestParams { + Compiler getCompiler(); + boolean printErrors(); + File getBeforeDirectory(); + File getAfterDirectory(); + File getMessagesDirectory(); + } private static final FileFilter JAVA_FILE_FILTER = new FileFilter() { @Override public boolean accept(File file) { @@ -26,11 +57,13 @@ public class DirectoryRunner extends Runner { private final Description description; private final Map tests = new TreeMap(); private final Throwable failure; - private File beforeDirectory; - private File afterDirectory; + private final TestParams params; - public DirectoryRunner(Class testClass) { + public DirectoryRunner(Class testClass) throws Exception { description = Description.createSuiteDescription(testClass); + + this.params = (TestParams) testClass.newInstance(); + Throwable error = null; try { addTests(testClass); @@ -40,26 +73,20 @@ public class DirectoryRunner extends Runner { } this.failure = error; } - + private void addTests(Class testClass) throws Exception { - Method beforeMethod = testClass.getDeclaredMethod("getBeforeDirectory"); - beforeDirectory = (File) beforeMethod.invoke(null); - - Method afterMethod = testClass.getDeclaredMethod("getAfterDirectory"); - afterDirectory = (File) afterMethod.invoke(null); - - for (File file : beforeDirectory.listFiles(JAVA_FILE_FILTER)) { + for (File file : params.getBeforeDirectory().listFiles(JAVA_FILE_FILTER)) { Description testDescription = Description.createTestDescription(testClass, file.getName()); description.addChild(testDescription); tests.put(file.getName(), testDescription); } } - + @Override public Description getDescription() { return description; } - + @Override public void run(RunNotifier notifier) { if (failure != null) { @@ -83,16 +110,25 @@ public class DirectoryRunner extends Runner { notifier.fireTestFinished(testDescription); } } - + private boolean runTest(String fileName) throws Throwable { - File file = new File(beforeDirectory, fileName); + File file = new File(params.getBeforeDirectory(), fileName); if (mustIgnore(file)) { return false; } - RunTestsViaDelombok.compareFile(beforeDirectory, afterDirectory, file); + switch (params.getCompiler()) { + case DELOMBOK: + new RunTestsViaDelombok().compareFile(params, file); + break; + case ECJ: + new RunTestsViaEcj().compareFile(params, file); + break; + case JAVAC: + throw new UnsupportedOperationException(); + } return true; } - + private boolean mustIgnore(File file) throws FileNotFoundException, IOException { BufferedReader reader = new BufferedReader(new FileReader(file)); String line = reader.readLine(); diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java index 37ff8f69..7f99b99e 100644 --- a/test/core/src/lombok/RunTestsViaDelombok.java +++ b/test/core/src/lombok/RunTestsViaDelombok.java @@ -1,5 +1,5 @@ /* - * Copyright © 2009 Reinier Zwitserloot and Roel Spilker. + * Copyright © 2009-2010 Reinier Zwitserloot and Roel Spilker. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,17 +21,8 @@ */ package lombok; -import static org.junit.Assert.*; - -import java.io.BufferedReader; import java.io.File; -import java.io.FileFilter; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; import javax.tools.Diagnostic; @@ -40,124 +31,21 @@ import javax.tools.JavaFileObject; import lombok.delombok.Delombok; -public class RunTestsViaDelombok { - private static final FileFilter JAVA_FILE_FILTER = new FileFilter() { - @Override public boolean accept(File file) { - return file.isFile() && file.getName().endsWith(".java"); - } - }; - - private static Delombok delombok = new Delombok(); - private static volatile boolean printErrors = false; - - private static final String LINE_SEPARATOR = System.getProperty("line.separator"); +public class RunTestsViaDelombok extends AbstractRunTests { + private Delombok delombok = new Delombok(); - public static void runComparison(File beforeDir, File afterDir) throws Throwable { - File[] listFiles = beforeDir.listFiles(JAVA_FILE_FILTER); - - for (File file : listFiles) { - compareFile(beforeDir, afterDir, file); - } - } - - public static void compareFile(File beforeDir, File afterDir, File file) throws Throwable { + @Override + public void transformCode(final StringBuilder messages, StringWriter result, File file) throws Throwable { delombok.setVerbose(false); delombok.setForceProcess(true); delombok.setCharset("UTF-8"); - - final StringBuilder messages = new StringBuilder(); + delombok.setDiagnosticsListener(new DiagnosticListener() { @Override public void report(Diagnostic d) { messages.append(String.format("%d:%d %s %s\n", d.getLineNumber(), d.getColumnNumber(), d.getKind(), d.getMessage(Locale.ENGLISH))); } }); - StringWriter writer = new StringWriter(); - delombok.delombok(file.getAbsolutePath(), writer); - compare(file.getName(), readFile(afterDir, file, false), writer.toString(), readFile(beforeDir, file, true), messages.toString()); - } - - public static void printErrors(boolean print) { - printErrors = print; - } - - private static void compare(String name, String expectedFile, String actualFile, String expectedMessages, String actualMessages) throws Throwable { - try { - compareContent(name, expectedFile, actualFile); - } - catch (Throwable e) { - if (printErrors) { - System.out.println("***** " + name + " *****"); - System.out.println(e.getMessage()); - System.out.println("**** Expected ******"); - System.out.println(expectedFile); - System.out.println("**** Actual ******"); - System.out.println(actualFile); - System.out.println("*******************"); - } - throw e; - } - try { - compareContent(name, expectedMessages, actualMessages); - } - catch (Throwable e) { - if (printErrors) { - System.out.println("***** " + name + " *****"); - System.out.println(e.getMessage()); - System.out.println("**** Expected ******"); - System.out.println(expectedMessages); - System.out.println("**** Actual ******"); - System.out.println(actualMessages); - System.out.println("*******************"); - } - throw e; - } - } - - private static void compareContent(String name, String expectedFile, String actualFile) { - String[] expectedLines = expectedFile.split("(\\r?\\n)"); - String[] actualLines = actualFile.split("(\\r?\\n)"); - if (actualLines[0].startsWith("// Generated by delombok at ")) { - actualLines[0] = ""; - } - expectedLines = removeBlanks(expectedLines); - actualLines = removeBlanks(actualLines); - int size = Math.min(expectedLines.length, actualLines.length); - for (int i = 0; i < size; i++) { - String expected = expectedLines[i]; - String actual = actualLines[i]; - assertEquals(String.format("Difference in %s on line %d", name, i + 1), expected, actual); - } - if (expectedLines.length > actualLines.length) { - fail(String.format("Missing line %d in generated %s: %s", size + 1, name, expectedLines[size])); - } - if (expectedLines.length < actualLines.length) { - fail(String.format("Extra line %d in generated %s: %s", size + 1, name, actualLines[size])); - } - } - - private static String readFile(File afterDir, File file, boolean messages) throws IOException { - BufferedReader reader; - try { - reader = new BufferedReader(new FileReader(new File(afterDir, file.getName() + (messages ? ".messages" : "")))); - } catch (FileNotFoundException e) { - return ""; - } - StringBuilder result = new StringBuilder(); - String line; - while ((line = reader.readLine()) != null) { - result.append(line); - result.append(LINE_SEPARATOR); - } - reader.close(); - return result.toString(); - } - - private static String[] removeBlanks(String[] in) { - List out = new ArrayList(); - for (String s : in) { - if (!s.trim().isEmpty()) out.add(s); - } - return out.toArray(new String[0]); + delombok.delombok(file.getAbsolutePath(), result); } -} \ No newline at end of file +} diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java new file mode 100644 index 00000000..3f7d6e81 --- /dev/null +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -0,0 +1,56 @@ +package lombok; + +import java.io.File; +import java.io.StringWriter; +import java.util.Locale; + +import lombok.eclipse.TransformEclipseAST; + +import org.eclipse.jdt.core.compiler.CategorizedProblem; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.batch.CompilationUnit; +import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; +import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; +import org.eclipse.jdt.internal.compiler.parser.Parser; +import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory; +import org.eclipse.jdt.internal.compiler.problem.ProblemReporter; + +public class RunTestsViaEcj extends AbstractRunTests { + protected static CompilerOptions ecjCompilerOptions() { + CompilerOptions options = new CompilerOptions(); + options.complianceLevel = ClassFileConstants.JDK1_6; + options.sourceLevel = ClassFileConstants.JDK1_6; + options.targetJDK = ClassFileConstants.JDK1_6; + options.parseLiteralExpressionsAsConstants = true; + return options; + } + + @Override + public void transformCode(final StringBuilder messages, StringWriter result, File file) throws Throwable { + ProblemReporter problemReporter = new ProblemReporter(new IErrorHandlingPolicy() { + public boolean proceedOnErrors() { + return true; + } + + public boolean stopOnFirstError() { + return false; + } + }, ecjCompilerOptions(), new DefaultProblemFactory(Locale.ENGLISH)); + + Parser parser = new Parser(problemReporter, true); + String source = readFile(file); + CompilationUnit sourceUnit = new CompilationUnit(source.toCharArray(), file.getName(), "UTF-8"); + CompilationResult compilationResult = new CompilationResult(sourceUnit, 0, 0, 0); + CompilationUnitDeclaration cud = parser.parse(sourceUnit, compilationResult); + + TransformEclipseAST.transform(parser, cud); + + for (CategorizedProblem p : compilationResult.getErrors()) { + messages.append(p.toString()).append("\n"); + } + + result.append(cud.toString()); + } +} diff --git a/test/delombok/resource/after/ClassNamedAfterGetter.java b/test/delombok/resource/after/ClassNamedAfterGetter.java deleted file mode 100644 index 769aaf7c..00000000 --- a/test/delombok/resource/after/ClassNamedAfterGetter.java +++ /dev/null @@ -1,7 +0,0 @@ -class GetFoo { - private int foo; - @java.lang.SuppressWarnings("all") - public int getFoo() { - return this.foo; - } -} diff --git a/test/delombok/resource/after/CleanupName.java b/test/delombok/resource/after/CleanupName.java deleted file mode 100644 index cd29eb68..00000000 --- a/test/delombok/resource/after/CleanupName.java +++ /dev/null @@ -1,18 +0,0 @@ -class CleanupName { - void test() { - Object o = "Hello World!"; - try { - System.out.println(o); - } finally { - o.toString(); - } - } - void test2() { - Object o = "Hello World too!"; - try { - System.out.println(o); - } finally { - o.toString(); - } - } -} diff --git a/test/delombok/resource/after/CleanupPlain.java b/test/delombok/resource/after/CleanupPlain.java deleted file mode 100644 index 35d51543..00000000 --- a/test/delombok/resource/after/CleanupPlain.java +++ /dev/null @@ -1,18 +0,0 @@ -import java.io.*; -class CleanupPlain { - void test() throws Exception { - InputStream in = new FileInputStream("in"); - try { - OutputStream out = new FileOutputStream("out"); - try { - if (in.markSupported()) { - out.flush(); - } - } finally { - out.close(); - } - } finally { - in.close(); - } - } -} diff --git a/test/delombok/resource/after/CommentsInterspersed.java b/test/delombok/resource/after/CommentsInterspersed.java deleted file mode 100644 index 5aaafe42..00000000 --- a/test/delombok/resource/after/CommentsInterspersed.java +++ /dev/null @@ -1,16 +0,0 @@ -/* cmt *//* cmt2 */ /* cmt3 */ /*bla */ -public class CommentsInterspersed { - /** javadoc for field */ - private int x; - /* bla2 */ private String test = "foo"; //$NON-NLS-1$ - /** Javadoc on method */ - public native void gwtTest(); /*-{ - javascript; - }-*/ - @java.lang.SuppressWarnings("all") - public String getTest() { - return this.test; - } -} //haha! -//hahaha! -//hahahaha! diff --git a/test/delombok/resource/after/DataIgnore.java b/test/delombok/resource/after/DataIgnore.java deleted file mode 100644 index feb2c0ef..00000000 --- a/test/delombok/resource/after/DataIgnore.java +++ /dev/null @@ -1,36 +0,0 @@ -class DataIgnore { - final int x; - String $name; - @java.beans.ConstructorProperties({"x"}) - @java.lang.SuppressWarnings("all") - public DataIgnore(final int x) { - this.x = x; - } - @java.lang.SuppressWarnings("all") - public int getX() { - return this.x; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (o == null) return false; - if (o.getClass() != this.getClass()) return false; - final DataIgnore other = (DataIgnore)o; - if (this.x != other.x) return false; - return true; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public int hashCode() { - final int PRIME = 31; - int result = 1; - result = result * PRIME + this.x; - return result; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "DataIgnore(x=" + this.x + ")"; - } -} diff --git a/test/delombok/resource/after/DataPlain.java b/test/delombok/resource/after/DataPlain.java deleted file mode 100644 index 2938a46e..00000000 --- a/test/delombok/resource/after/DataPlain.java +++ /dev/null @@ -1,92 +0,0 @@ -class Data1 { - final int x; - String name; - @java.beans.ConstructorProperties({"x"}) - @java.lang.SuppressWarnings("all") - public Data1(final int x) { - this.x = x; - } - @java.lang.SuppressWarnings("all") - public int getX() { - return this.x; - } - @java.lang.SuppressWarnings("all") - public String getName() { - return this.name; - } - @java.lang.SuppressWarnings("all") - public void setName(final String name) { - this.name = name; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (o == null) return false; - if (o.getClass() != this.getClass()) return false; - final Data1 other = (Data1)o; - if (this.x != other.x) return false; - if (this.name == null ? other.name != null : !this.name.equals(other.name)) return false; - return true; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public int hashCode() { - final int PRIME = 31; - int result = 1; - result = result * PRIME + this.x; - result = result * PRIME + (this.name == null ? 0 : this.name.hashCode()); - return result; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "Data1(x=" + this.x + ", name=" + this.name + ")"; - } -} -class Data2 { - final int x; - String name; - @java.beans.ConstructorProperties({"x"}) - @java.lang.SuppressWarnings("all") - public Data2(final int x) { - this.x = x; - } - @java.lang.SuppressWarnings("all") - public int getX() { - return this.x; - } - @java.lang.SuppressWarnings("all") - public String getName() { - return this.name; - } - @java.lang.SuppressWarnings("all") - public void setName(final String name) { - this.name = name; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (o == null) return false; - if (o.getClass() != this.getClass()) return false; - final Data2 other = (Data2)o; - if (this.x != other.x) return false; - if (this.name == null ? other.name != null : !this.name.equals(other.name)) return false; - return true; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public int hashCode() { - final int PRIME = 31; - int result = 1; - result = result * PRIME + this.x; - result = result * PRIME + (this.name == null ? 0 : this.name.hashCode()); - return result; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "Data2(x=" + this.x + ", name=" + this.name + ")"; - } -} diff --git a/test/delombok/resource/after/GetterAccessLevel.java b/test/delombok/resource/after/GetterAccessLevel.java deleted file mode 100644 index 6d977d87..00000000 --- a/test/delombok/resource/after/GetterAccessLevel.java +++ /dev/null @@ -1,49 +0,0 @@ -class GetterAccessLevel { - boolean isNone; - boolean isPrivate; - boolean isPackage; - boolean isProtected; - boolean isPublic; - String noneString; - String privateString; - String packageString; - String protectedString; - String publicString; - String value; - @java.lang.SuppressWarnings("all") - private boolean isPrivate() { - return this.isPrivate; - } - @java.lang.SuppressWarnings("all") - boolean isPackage() { - return this.isPackage; - } - @java.lang.SuppressWarnings("all") - protected boolean isProtected() { - return this.isProtected; - } - @java.lang.SuppressWarnings("all") - public boolean isPublic() { - return this.isPublic; - } - @java.lang.SuppressWarnings("all") - private String getPrivateString() { - return this.privateString; - } - @java.lang.SuppressWarnings("all") - String getPackageString() { - return this.packageString; - } - @java.lang.SuppressWarnings("all") - protected String getProtectedString() { - return this.protectedString; - } - @java.lang.SuppressWarnings("all") - public String getPublicString() { - return this.publicString; - } - @java.lang.SuppressWarnings("all") - public String getValue() { - return this.value; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/GetterAlreadyExists.java b/test/delombok/resource/after/GetterAlreadyExists.java deleted file mode 100644 index 6a5377ba..00000000 --- a/test/delombok/resource/after/GetterAlreadyExists.java +++ /dev/null @@ -1,140 +0,0 @@ -class Getter1 { - boolean foo; - boolean hasFoo() { - return true; - } -} -class Getter2 { - boolean foo; - boolean isFoo() { - return true; - } -} -class Getter3 { - boolean foo; - boolean getFoo() { - return true; - } -} -class Getter4 { - String foo; - String hasFoo() { - return null; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter5 { - String foo; - String isFoo() { - return null; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter6 { - String foo; - String getFoo() { - return null; - } -} -class Getter7 { - String foo; - boolean hasFoo() { - return false; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter8 { - String foo; - boolean isFoo() { - return false; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter9 { - String foo; - boolean getFoo() { - return false; - } -} -class Getter10 { - boolean foo; - static boolean hasFoo() { - return false; - } -} -class Getter11 { - boolean foo; - static boolean isFoo() { - return false; - } -} -class Getter12 { - boolean foo; - static boolean getFoo() { - return false; - } -} -class Getter13 { - String foo; - static boolean hasFoo() { - return false; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter14 { - String foo; - static boolean isFoo() { - return false; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter15 { - String foo; - static boolean getFoo() { - return false; - } -} -class Getter16 { - String foo; - static String hasFoo() { - return false; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter17 { - String foo; - static String isFoo() { - return false; - } - @java.lang.SuppressWarnings("all") - public String getFoo() { - return this.foo; - } -} -class Getter18 { - String foo; - static String getFoo() { - return false; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/GetterBoolean.java b/test/delombok/resource/after/GetterBoolean.java deleted file mode 100644 index a727e49b..00000000 --- a/test/delombok/resource/after/GetterBoolean.java +++ /dev/null @@ -1,23 +0,0 @@ -class Getter { - boolean foo; - boolean isBar; - boolean hasBaz; - @java.lang.SuppressWarnings("all") - public boolean isFoo() { - return this.foo; - } - @java.lang.SuppressWarnings("all") - public boolean isBar() { - return this.isBar; - } - @java.lang.SuppressWarnings("all") - public boolean hasBaz() { - return this.hasBaz; - } -} -class MoreGetter { - boolean foo; - boolean hasFoo() { - return true; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/GetterOnClass.java b/test/delombok/resource/after/GetterOnClass.java deleted file mode 100644 index bd15ce35..00000000 --- a/test/delombok/resource/after/GetterOnClass.java +++ /dev/null @@ -1,59 +0,0 @@ -class GetterOnClass1 { - boolean isNone; - boolean isPublic; - @java.lang.SuppressWarnings("all") - public boolean isPublic() { - return this.isPublic; - } -} -class GetterOnClass2 { - boolean isNone; - boolean isProtected; - boolean isPackage; - @java.lang.SuppressWarnings("all") - protected boolean isProtected() { - return this.isProtected; - } - @java.lang.SuppressWarnings("all") - boolean isPackage() { - return this.isPackage; - } -} -class GetterOnClass3 { - boolean isNone; - boolean isPackage; - @java.lang.SuppressWarnings("all") - boolean isPackage() { - return this.isPackage; - } -} -class GetterOnClass4 { - boolean isNone; - boolean isPrivate; - @java.lang.SuppressWarnings("all") - private boolean isPrivate() { - return this.isPrivate; - } -} -class GetterOnClass5 { - boolean isNone; - boolean isPublic; - @java.lang.SuppressWarnings("all") - public boolean isPublic() { - return this.isPublic; - } -} -class GetterOnClass6 { - String couldBeNull; - @lombok.NonNull - String nonNull; - @java.lang.SuppressWarnings("all") - public String getCouldBeNull() { - return this.couldBeNull; - } - @lombok.NonNull - @java.lang.SuppressWarnings("all") - public String getNonNull() { - return this.nonNull; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/GetterPlain.java b/test/delombok/resource/after/GetterPlain.java deleted file mode 100644 index 359d46e2..00000000 --- a/test/delombok/resource/after/GetterPlain.java +++ /dev/null @@ -1,12 +0,0 @@ -class GetterPlain { - int i; - int foo; - @java.lang.SuppressWarnings("all") - public int getI() { - return this.i; - } - @java.lang.SuppressWarnings("all") - public int getFoo() { - return this.foo; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/GetterWithDollar.java b/test/delombok/resource/after/GetterWithDollar.java deleted file mode 100644 index 9e02ccb8..00000000 --- a/test/delombok/resource/after/GetterWithDollar.java +++ /dev/null @@ -1,15 +0,0 @@ -class GetterWithDollar1 { - int $i; - @java.lang.SuppressWarnings("all") - public int getI() { - return this.$i; - } -} -class GetterWithDollar2 { - int $i; - int i; - @java.lang.SuppressWarnings("all") - public int getI() { - return this.i; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/NonNullPlain.java b/test/delombok/resource/after/NonNullPlain.java deleted file mode 100644 index 19869db1..00000000 --- a/test/delombok/resource/after/NonNullPlain.java +++ /dev/null @@ -1,25 +0,0 @@ -class NonNullPlain { - @lombok.NonNull - int i; - @lombok.NonNull - String s; - @lombok.NonNull - @java.lang.SuppressWarnings("all") - public int getI() { - return this.i; - } - @java.lang.SuppressWarnings("all") - public void setI(@lombok.NonNull final int i) { - this.i = i; - } - @lombok.NonNull - @java.lang.SuppressWarnings("all") - public String getS() { - return this.s; - } - @java.lang.SuppressWarnings("all") - public void setS(@lombok.NonNull final String s) { - if (s == null) throw new java.lang.NullPointerException("s"); - this.s = s; - } -} diff --git a/test/delombok/resource/after/SetterAccessLevel.java b/test/delombok/resource/after/SetterAccessLevel.java deleted file mode 100644 index dce4cc2f..00000000 --- a/test/delombok/resource/after/SetterAccessLevel.java +++ /dev/null @@ -1,28 +0,0 @@ -class SetterAccessLevel { - boolean isNone; - boolean isPrivate; - boolean isPackage; - boolean isProtected; - boolean isPublic; - boolean value; - @java.lang.SuppressWarnings("all") - private void setIsPrivate(final boolean isPrivate) { - this.isPrivate = isPrivate; - } - @java.lang.SuppressWarnings("all") - void setIsPackage(final boolean isPackage) { - this.isPackage = isPackage; - } - @java.lang.SuppressWarnings("all") - protected void setIsProtected(final boolean isProtected) { - this.isProtected = isProtected; - } - @java.lang.SuppressWarnings("all") - public void setIsPublic(final boolean isPublic) { - this.isPublic = isPublic; - } - @java.lang.SuppressWarnings("all") - public void setValue(final boolean value) { - this.value = value; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SetterAlreadyExists.java b/test/delombok/resource/after/SetterAlreadyExists.java deleted file mode 100644 index e4992b29..00000000 --- a/test/delombok/resource/after/SetterAlreadyExists.java +++ /dev/null @@ -1,35 +0,0 @@ -class Setter1 { - boolean foo; - void setFoo(boolean foo) { - } -} -class Setter2 { - boolean foo; - void setFoo(String foo) { - } -} -class Setter3 { - String foo; - void setFoo(boolean foo) { - } -} -class Setter4 { - String foo; - void setFoo(String foo) { - } -} -class Setter5 { - String foo; - void setFoo() { - } -} -class Setter6 { - String foo; - void setFoo(String foo, int x) { - } -} -class Setter7 { - String foo; - static void setFoo() { - } -} diff --git a/test/delombok/resource/after/SetterOnClass.java b/test/delombok/resource/after/SetterOnClass.java deleted file mode 100644 index 05528ff8..00000000 --- a/test/delombok/resource/after/SetterOnClass.java +++ /dev/null @@ -1,59 +0,0 @@ -class SetterOnClass1 { - boolean isNone; - boolean isPublic; - @java.lang.SuppressWarnings("all") - public void setIsPublic(final boolean isPublic) { - this.isPublic = isPublic; - } -} -class SetterOnClass2 { - boolean isNone; - boolean isProtected; - boolean isPackage; - @java.lang.SuppressWarnings("all") - protected void setIsProtected(final boolean isProtected) { - this.isProtected = isProtected; - } - @java.lang.SuppressWarnings("all") - void setIsPackage(final boolean isPackage) { - this.isPackage = isPackage; - } -} -class SetterOnClass3 { - boolean isNone; - boolean isPackage; - @java.lang.SuppressWarnings("all") - void setIsPackage(final boolean isPackage) { - this.isPackage = isPackage; - } -} -class SetterOnClass4 { - boolean isNone; - boolean isPrivate; - @java.lang.SuppressWarnings("all") - private void setIsPrivate(final boolean isPrivate) { - this.isPrivate = isPrivate; - } -} -class SetterOnClass5 { - boolean isNone; - boolean isPublic; - @java.lang.SuppressWarnings("all") - public void setIsPublic(final boolean isPublic) { - this.isPublic = isPublic; - } -} -class SetterOnClass6 { - String couldBeNull; - @lombok.NonNull - String nonNull; - @java.lang.SuppressWarnings("all") - public void setCouldBeNull(final String couldBeNull) { - this.couldBeNull = couldBeNull; - } - @java.lang.SuppressWarnings("all") - public void setNonNull(@lombok.NonNull final String nonNull) { - if (nonNull == null) throw new java.lang.NullPointerException("nonNull"); - this.nonNull = nonNull; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SetterPlain.java b/test/delombok/resource/after/SetterPlain.java deleted file mode 100644 index 39aa7b61..00000000 --- a/test/delombok/resource/after/SetterPlain.java +++ /dev/null @@ -1,12 +0,0 @@ -class SetterPlain { - int i; - int foo; - @java.lang.SuppressWarnings("all") - public void setI(final int i) { - this.i = i; - } - @java.lang.SuppressWarnings("all") - public void setFoo(final int foo) { - this.foo = foo; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SetterWithDollar.java b/test/delombok/resource/after/SetterWithDollar.java deleted file mode 100644 index c26a1ccd..00000000 --- a/test/delombok/resource/after/SetterWithDollar.java +++ /dev/null @@ -1,15 +0,0 @@ -class SetterWithDollar1 { - int $i; - - public void setI(final int i) { - this.$i = i; - } -} -class SetterWithDollar2 { - int $i; - int i; - - public void setI(final int i) { - this.i = i; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SneakyThrowsMultiple.java b/test/delombok/resource/after/SneakyThrowsMultiple.java deleted file mode 100644 index bab13990..00000000 --- a/test/delombok/resource/after/SneakyThrowsMultiple.java +++ /dev/null @@ -1,45 +0,0 @@ -import java.awt.AWTException; -import java.io.IOException; -import java.util.Random; -class SneakyThrowsMultiple { - public void test() { - try { - try { - System.out.println("test1"); - throw new IOException(); - } catch (IOException $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } catch (Throwable $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } - public void test2() { - try { - try { - System.out.println("test2"); - if (new Random().nextBoolean()) { - throw new IOException(); - } else { - throw new AWTException("WHAT"); - } - } catch (AWTException $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } catch (IOException $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } - public void test3() { - try { - try { - System.out.println("test3"); - throw new IOException(); - } catch (IOException $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } catch (Throwable $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SneakyThrowsPlain.java b/test/delombok/resource/after/SneakyThrowsPlain.java deleted file mode 100644 index d5abc478..00000000 --- a/test/delombok/resource/after/SneakyThrowsPlain.java +++ /dev/null @@ -1,17 +0,0 @@ -class SneakyThrowsPlain { - public void test() { - try { - System.out.println("test1"); - } catch (java.lang.Throwable $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } - - public void test2() { - try { - System.out.println("test2"); - } catch (java.lang.Throwable $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SneakyThrowsSingle.java b/test/delombok/resource/after/SneakyThrowsSingle.java deleted file mode 100644 index 519d06a9..00000000 --- a/test/delombok/resource/after/SneakyThrowsSingle.java +++ /dev/null @@ -1,26 +0,0 @@ -import java.io.IOException; -class SneakyThrowsSingle { - public void test() { - try { - System.out.println("test1"); - } catch (Throwable $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } - public void test2() { - try { - System.out.println("test2"); - throw new IOException(); - } catch (IOException $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } - public void test3() { - try { - System.out.println("test3"); - throw new IOException(); - } catch (IOException $ex) { - throw lombok.Lombok.sneakyThrow($ex); - } - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/SynchronizedName.java b/test/delombok/resource/after/SynchronizedName.java deleted file mode 100644 index 066e3bdf..00000000 --- a/test/delombok/resource/after/SynchronizedName.java +++ /dev/null @@ -1,25 +0,0 @@ -class SynchronizedName { - private Object read = new Object(); - private static Object READ = new Object(); - void test1() { - synchronized (read) { - System.out.println("one"); - } - } - void test2() { - System.out.println("two"); - } - static void test3() { - System.out.println("three"); - } - void test4() { - synchronized (READ) { - System.out.println("four"); - } - } - void test5() { - synchronized (read) { - System.out.println("five"); - } - } -} diff --git a/test/delombok/resource/after/SynchronizedPlain.java b/test/delombok/resource/after/SynchronizedPlain.java deleted file mode 100644 index 695a3089..00000000 --- a/test/delombok/resource/after/SynchronizedPlain.java +++ /dev/null @@ -1,28 +0,0 @@ -class SynchronizedPlain1 { - void test() { - synchronized (this.$lock) { - System.out.println("one"); - } - } - void test2() { - synchronized (this.$lock) { - System.out.println("two"); - } - } - @java.lang.SuppressWarnings("all") - private final java.lang.Object $lock = new java.lang.Object[0]; -} -class SynchronizedPlain2 { - static void test() { - synchronized (SynchronizedPlain2.$LOCK) { - System.out.println("three"); - } - } - static void test2() { - synchronized (SynchronizedPlain2.$LOCK) { - System.out.println("four"); - } - } - @java.lang.SuppressWarnings("all") - private static final java.lang.Object $LOCK = new java.lang.Object[0]; -} \ No newline at end of file diff --git a/test/delombok/resource/after/ToStringInner.java b/test/delombok/resource/after/ToStringInner.java deleted file mode 100644 index 29e7dc91..00000000 --- a/test/delombok/resource/after/ToStringInner.java +++ /dev/null @@ -1,32 +0,0 @@ -class ToStringOuter { - final int x; - String name; - class ToStringInner { - final int y; - @java.lang.Override - public java.lang.String toString() { - return "ToStringOuter.ToStringInner(y=" + y + ")"; - } - } - static class ToStringStaticInner { - final int y; - @java.lang.Override - public java.lang.String toString() { - return "ToStringOuter.ToStringStaticInner(y=" + y + ")"; - } - } - class ToStringMiddle { - class ToStringMoreInner { - final String name; - @java.lang.Override - public java.lang.String toString() { - return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + name + ")"; - } - } - } - - @java.lang.Override - public java.lang.String toString() { - return "ToStringOuter(x=" + x + ", name=" + name + ")"; - } -} \ No newline at end of file diff --git a/test/delombok/resource/after/ToStringPlain.java b/test/delombok/resource/after/ToStringPlain.java deleted file mode 100644 index 20227464..00000000 --- a/test/delombok/resource/after/ToStringPlain.java +++ /dev/null @@ -1,18 +0,0 @@ -class ToString1 { - final int x; - String name; - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "ToString1(x=" + this.x + ", name=" + this.name + ")"; - } -} -class ToString2 { - final int x; - String name; - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "ToString2(x=" + this.x + ", name=" + this.name + ")"; - } -} \ No newline at end of file diff --git a/test/delombok/resource/before/ClassNamedAfterGetter.java b/test/delombok/resource/before/ClassNamedAfterGetter.java deleted file mode 100644 index fe61eda1..00000000 --- a/test/delombok/resource/before/ClassNamedAfterGetter.java +++ /dev/null @@ -1,3 +0,0 @@ -class GetFoo { - @lombok.Getter private int foo; -} diff --git a/test/delombok/resource/before/CleanupName.java b/test/delombok/resource/before/CleanupName.java deleted file mode 100644 index cbc5b447..00000000 --- a/test/delombok/resource/before/CleanupName.java +++ /dev/null @@ -1,10 +0,0 @@ -class CleanupName { - void test() { - @lombok.Cleanup("toString") Object o = "Hello World!"; - System.out.println(o); - } - void test2() { - @lombok.Cleanup(value="toString") Object o = "Hello World too!"; - System.out.println(o); - } -} \ No newline at end of file diff --git a/test/delombok/resource/before/CleanupPlain.java b/test/delombok/resource/before/CleanupPlain.java deleted file mode 100644 index a91ac3c1..00000000 --- a/test/delombok/resource/before/CleanupPlain.java +++ /dev/null @@ -1,11 +0,0 @@ -import lombok.Cleanup; -import java.io.*; -class CleanupPlain { - void test() throws Exception { - @lombok.Cleanup InputStream in = new FileInputStream("in"); - @Cleanup OutputStream out = new FileOutputStream("out"); - if (in.markSupported()) { - out.flush(); - } - } -} \ No newline at end of file diff --git a/test/delombok/resource/before/CommentsInterspersed.java b/test/delombok/resource/before/CommentsInterspersed.java deleted file mode 100644 index e7898aaa..00000000 --- a/test/delombok/resource/before/CommentsInterspersed.java +++ /dev/null @@ -1,17 +0,0 @@ -import /* cmt */ lombok./* cmt2 */Getter /* cmt3 */ ; - -public /*bla */ class CommentsInterspersed { - /** javadoc for field */ - private int x; - - private /* bla2 */ @Getter String test = "foo"; //$NON-NLS-1$ - - /** Javadoc on method */ - public native void gwtTest(); /*-{ - javascript; - }-*/ -} //haha! -//hahaha! - -//hahahaha! - diff --git a/test/delombok/resource/before/DataIgnore.java b/test/delombok/resource/before/DataIgnore.java deleted file mode 100644 index 5f957bdc..00000000 --- a/test/delombok/resource/before/DataIgnore.java +++ /dev/null @@ -1,4 +0,0 @@ -@lombok.Data class DataIgnore { - final int x; - String $name; -} diff --git a/test/delombok/resource/before/DataPlain.java b/test/delombok/resource/before/DataPlain.java deleted file mode 100644 index 680ae46f..00000000 --- a/test/delombok/resource/before/DataPlain.java +++ /dev/null @@ -1,9 +0,0 @@ -import lombok.Data; -@lombok.Data class Data1 { - final int x; - String name; -} -@Data class Data2 { - final int x; - String name; -} \ No newline at end of file diff --git a/test/delombok/resource/before/GetterAccessLevel.java b/test/delombok/resource/before/GetterAccessLevel.java deleted file mode 100644 index 413b888e..00000000 --- a/test/delombok/resource/before/GetterAccessLevel.java +++ /dev/null @@ -1,24 +0,0 @@ -class GetterAccessLevel { - @lombok.Getter(lombok.AccessLevel.NONE) - boolean isNone; - @lombok.Getter(lombok.AccessLevel.PRIVATE) - boolean isPrivate; - @lombok.Getter(lombok.AccessLevel.PACKAGE) - boolean isPackage; - @lombok.Getter(lombok.AccessLevel.PROTECTED) - boolean isProtected; - @lombok.Getter(lombok.AccessLevel.PUBLIC) - boolean isPublic; - @lombok.Getter(lombok.AccessLevel.NONE) - String noneString; - @lombok.Getter(lombok.AccessLevel.PRIVATE) - String privateString; - @lombok.Getter(lombok.AccessLevel.PACKAGE) - String packageString; - @lombok.Getter(lombok.AccessLevel.PROTECTED) - String protectedString; - @lombok.Getter(lombok.AccessLevel.PUBLIC) - String publicString; - @lombok.Getter(value=lombok.AccessLevel.PUBLIC) - String value; -} diff --git a/test/delombok/resource/before/GetterAlreadyExists.java b/test/delombok/resource/before/GetterAlreadyExists.java deleted file mode 100644 index 93b77dc1..00000000 --- a/test/delombok/resource/before/GetterAlreadyExists.java +++ /dev/null @@ -1,108 +0,0 @@ -class Getter1 { - @lombok.Getter boolean foo; - boolean hasFoo() { - return true; - } -} -class Getter2 { - @lombok.Getter boolean foo; - boolean isFoo() { - return true; - } -} -class Getter3 { - @lombok.Getter boolean foo; - boolean getFoo() { - return true; - } -} -class Getter4 { - @lombok.Getter String foo; - Strin