From 844995fc606085af7c102954ee342edfd8cd623a Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Thu, 8 May 2014 00:38:50 +0200
Subject: All tests now succeed on all platforms again; 'optional' expected
 messages added. expanded some tests. Added a check if the bootclasspath
 supports a certain version, i.e. don't try to run a JDK7-only test if
 AutoClosable isn't available.

---
 test/transform/resource/after-delombok/MixGetterVal.java            | 2 ++
 test/transform/resource/after-delombok/ValInTryWithResources.java   | 1 +
 test/transform/resource/after-ecj/MixGetterVal.java                 | 2 ++
 test/transform/resource/before/MixGetterVal.java                    | 2 ++
 test/transform/resource/messages-idempotent/ValErrors.java.messages | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'test/transform')

diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java
index 7662608b..abc60d56 100644
--- a/test/transform/resource/after-delombok/MixGetterVal.java
+++ b/test/transform/resource/after-delombok/MixGetterVal.java
@@ -5,6 +5,8 @@ class MixGetterVal {
 	public void test() {
 		final int y = x;
 		m(y);
+		final int a = getX();
+		m(a);
 	}
 	@java.lang.SuppressWarnings("all")
 	public int getX() {
diff --git a/test/transform/resource/after-delombok/ValInTryWithResources.java b/test/transform/resource/after-delombok/ValInTryWithResources.java
index 42bd3193..e1041928 100644
--- a/test/transform/resource/after-delombok/ValInTryWithResources.java
+++ b/test/transform/resource/after-delombok/ValInTryWithResources.java
@@ -1,3 +1,4 @@
+//version 7:
 import java.io.IOException;
 public class ValInTryWithResources {
 	public void whyTryInsteadOfCleanup() throws IOException {
diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java
index 45fcf989..d9809703 100644
--- a/test/transform/resource/after-ecj/MixGetterVal.java
+++ b/test/transform/resource/after-ecj/MixGetterVal.java
@@ -10,6 +10,8 @@ class MixGetterVal {
   public void test() {
     final @val int y = x;
     m(y);
+    final @val int a = getX();
+    m(a);
   }
   public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
diff --git a/test/transform/resource/before/MixGetterVal.java b/test/transform/resource/before/MixGetterVal.java
index f80d2927..3f06b1a8 100644
--- a/test/transform/resource/before/MixGetterVal.java
+++ b/test/transform/resource/before/MixGetterVal.java
@@ -8,5 +8,7 @@ class MixGetterVal {
 	public void test() {
 		val y = x;
 		m(y);
+		val a = getX();
+		m(a);
 	}
 }
diff --git a/test/transform/resource/messages-idempotent/ValErrors.java.messages b/test/transform/resource/messages-idempotent/ValErrors.java.messages
index c2432c6a..f61d3a33 100644
--- a/test/transform/resource/messages-idempotent/ValErrors.java.messages
+++ b/test/transform/resource/messages-idempotent/ValErrors.java.messages
@@ -1,3 +1,3 @@
 3 cannot find symbol
 6 cannot find symbol
-6 illegal initializer for <none>
+OPTIONAL 6 illegal initializer for <none>
-- 
cgit