From 233400eacba84ec33bfba5207481a6f5ec00aa65 Mon Sep 17 00:00:00 2001 From: Sander Koning Date: Wed, 22 Feb 2017 10:17:30 +0100 Subject: Make tests run if no (eclipse-generated?) bin/ folder exists --- test/core/src/lombok/RunTestsViaEcj.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 3f2698bb..775e825c 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -137,7 +137,7 @@ public class RunTestsViaEcj extends AbstractRunTests { i.remove(); } } - classpath.add("bin"); + if (new File("bin").exists()) classpath.add("bin"); classpath.add("dist/lombok.jar"); classpath.add("lib/test/commons-logging-commons-logging.jar"); classpath.add("lib/test/org.slf4j-slf4j-api.jar"); -- cgit From ea9fbb426f60bd1b7c3dea2b0485eae8eaafedda Mon Sep 17 00:00:00 2001 From: Sander Koning Date: Wed, 22 Feb 2017 10:18:33 +0100 Subject: Use already downloaded rt-openjdk6.jar if it exists. This allows builds to run without a network connection. --- build.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 654c23ea..44f09de8 100644 --- a/build.xml +++ b/build.xml @@ -28,7 +28,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + + @@ -101,8 +102,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - - + + -- cgit From 1244721734a2025d1e3268f09846f9469f10f415 Mon Sep 17 00:00:00 2001 From: Sander Koning Date: Wed, 22 Feb 2017 10:19:01 +0100 Subject: Rename a set of case-differing transformation tests to make them work on case-sensitive file systems. --- .../EqualsAndHashCodeOfAndExclude.java | 46 ++++++++++++++++++++++ .../after-delombok/EqualsAndHashcodeOfExclude.java | 46 ---------------------- .../after-ecj/EqualsAndHashCodeOfAndExclude.java | 46 ++++++++++++++++++++++ .../after-ecj/EqualsAndHashcodeOfExclude.java | 46 ---------------------- .../before/EqualsAndHashCodeOfAndExclude.java | 11 ++++++ .../before/EqualsAndHashCodeOfExclude.java | 11 ------ 6 files changed, 103 insertions(+), 103 deletions(-) create mode 100644 test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java delete mode 100644 test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java create mode 100644 test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java delete mode 100644 test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java create mode 100644 test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java delete mode 100644 test/transform/resource/before/EqualsAndHashCodeOfExclude.java diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java new file mode 100644 index 00000000..8b9888e9 --- /dev/null +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java @@ -0,0 +1,46 @@ +final class EqualsAndHashCodeOf { + int x; + int y; + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof EqualsAndHashCodeOf)) return false; + final EqualsAndHashCodeOf other = (EqualsAndHashCodeOf) o; + if (this.x != other.x) return false; + return true; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + this.x; + return result; + } +} +final class EqualsAndHashCodeExclude { + int x; + int y; + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof EqualsAndHashCodeExclude)) return false; + final EqualsAndHashCodeExclude other = (EqualsAndHashCodeExclude) o; + if (this.x != other.x) return false; + return true; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + this.x; + return result; + } +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java deleted file mode 100644 index 8b9888e9..00000000 --- a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java +++ /dev/null @@ -1,46 +0,0 @@ -final class EqualsAndHashCodeOf { - int x; - int y; - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (!(o instanceof EqualsAndHashCodeOf)) return false; - final EqualsAndHashCodeOf other = (EqualsAndHashCodeOf) o; - if (this.x != other.x) return false; - return true; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public int hashCode() { - final int PRIME = 59; - int result = 1; - result = result * PRIME + this.x; - return result; - } -} -final class EqualsAndHashCodeExclude { - int x; - int y; - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (!(o instanceof EqualsAndHashCodeExclude)) return false; - final EqualsAndHashCodeExclude other = (EqualsAndHashCodeExclude) o; - if (this.x != other.x) return false; - return true; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public int hashCode() { - final int PRIME = 59; - int result = 1; - result = result * PRIME + this.x; - return result; - } -} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java new file mode 100644 index 00000000..30de15cf --- /dev/null +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java @@ -0,0 +1,46 @@ +final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf { + int x; + int y; + EqualsAndHashCodeOf() { + super(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + if ((o == this)) + return true; + if ((! (o instanceof EqualsAndHashCodeOf))) + return false; + final EqualsAndHashCodeOf other = (EqualsAndHashCodeOf) o; + if ((this.x != other.x)) + return false; + return true; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + final int PRIME = 59; + int result = 1; + result = ((result * PRIME) + this.x); + return result; + } +} +final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude { + int x; + int y; + EqualsAndHashCodeExclude() { + super(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + if ((o == this)) + return true; + if ((! (o instanceof EqualsAndHashCodeExclude))) + return false; + final EqualsAndHashCodeExclude other = (EqualsAndHashCodeExclude) o; + if ((this.x != other.x)) + return false; + return true; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + final int PRIME = 59; + int result = 1; + result = ((result * PRIME) + this.x); + return result; + } +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java deleted file mode 100644 index 283c5430..00000000 --- a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java +++ /dev/null @@ -1,46 +0,0 @@ -final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf { - int x; - int y; - EqualsAndHashCodeOf() { - super(); - } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { - if ((o == this)) - return true; - if ((! (o instanceof EqualsAndHashCodeOf))) - return false; - final EqualsAndHashCodeOf other = (EqualsAndHashCodeOf) o; - if ((this.x != other.x)) - return false; - return true; - } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { - final int PRIME = 59; - int result = 1; - result = ((result * PRIME) + this.x); - return result; - } -} -final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude { - int x; - int y; - EqualsAndHashCodeExclude() { - super(); - } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { - if ((o == this)) - return true; - if ((! (o instanceof EqualsAndHashCodeExclude))) - return false; - final EqualsAndHashCodeExclude other = (EqualsAndHashCodeExclude) o; - if ((this.x != other.x)) - return false; - return true; - } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { - final int PRIME = 59; - int result = 1; - result = ((result * PRIME) + this.x); - return result; - } -} \ No newline at end of file diff --git a/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java new file mode 100644 index 00000000..b8ba21fb --- /dev/null +++ b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java @@ -0,0 +1,11 @@ +@lombok.EqualsAndHashCode(of={"x"}) +final class EqualsAndHashCodeOf { + int x; + int y; +} + +@lombok.EqualsAndHashCode(exclude={"y"}) +final class EqualsAndHashCodeExclude { + int x; + int y; +} diff --git a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java b/test/transform/resource/before/EqualsAndHashCodeOfExclude.java deleted file mode 100644 index 0625ba52..00000000 --- a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java +++ /dev/null @@ -1,11 +0,0 @@ -@lombok.EqualsAndHashCode(of={"x"}) -final class EqualsAndHashCodeOf { - int x; - int y; -} - -@lombok.EqualsAndHashCode(exclude={"y"}) -final class EqualsAndHashCodeExclude { - int x; - int y; -} \ No newline at end of file -- cgit