From 29e07a48755066f6a1bbaf6de12c3af3a9970d95 Mon Sep 17 00:00:00 2001 From: grootjans Date: Sun, 31 Oct 2010 23:56:49 +0100 Subject: Added after-delombok test files for Logger --- test/transform/resource/after-delombok/LoggerCommons.java | 6 ++++++ test/transform/resource/after-delombok/LoggerJul.java | 5 +++++ test/transform/resource/after-delombok/LoggerLog4j.java | 5 +++++ test/transform/resource/after-delombok/LoggerSlf4j.java | 6 ++++++ 4 files changed, 22 insertions(+) create mode 100644 test/transform/resource/after-delombok/LoggerCommons.java create mode 100644 test/transform/resource/after-delombok/LoggerJul.java create mode 100644 test/transform/resource/after-delombok/LoggerLog4j.java create mode 100644 test/transform/resource/after-delombok/LoggerSlf4j.java (limited to 'test/transform/resource') diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java new file mode 100644 index 00000000..686ab889 --- /dev/null +++ b/test/transform/resource/after-delombok/LoggerCommons.java @@ -0,0 +1,6 @@ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +class LoggerCommons { + private static final Log log = LogFactory.getLog(LoggerCommons.class); +} \ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java new file mode 100644 index 00000000..911c5048 --- /dev/null +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -0,0 +1,5 @@ +import java.util.logging.Logger; + +class LoggerJul { + private static final Logger log = Logger.getLogger("LoggerJul"); +} \ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java new file mode 100644 index 00000000..33f90278 --- /dev/null +++ b/test/transform/resource/after-delombok/LoggerLog4j.java @@ -0,0 +1,5 @@ +import org.apache.log4j.Logger; + +class LoggerLog4j { + private static final Logger log = Logger.getLogger(LoggerLog4j.class); +} \ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java new file mode 100644 index 00000000..0d7dee22 --- /dev/null +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -0,0 +1,6 @@ +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +class LoggerLog4j { + private static final Logger log = LoggerFactory.getLogger(LoggerLog4j.class); +} \ No newline at end of file -- cgit From 5897d9685e4f606319a9707ae22efe4740b3f630 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 2 Nov 2010 20:36:51 +0100 Subject: Removed trailing tab --- test/transform/resource/after-delombok/LoggerJul.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/transform/resource') diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java index 911c5048..de4ad914 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,5 +1,5 @@ import java.util.logging.Logger; class LoggerJul { - private static final Logger log = Logger.getLogger("LoggerJul"); + private static final Logger log = Logger.getLogger("LoggerJul"); } \ No newline at end of file -- cgit From 17bcfda43b9e939ac22d5247ef98905741650432 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 2 Nov 2010 20:39:58 +0100 Subject: Issue 154: Add null-check to @Cleanup --- test/transform/resource/after-delombok/CleanupName.java | 8 ++++++-- test/transform/resource/after-delombok/CleanupPlain.java | 8 ++++++-- test/transform/resource/after-ecj/CleanupName.java | 10 ++++++++-- test/transform/resource/after-ecj/CleanupPlain.java | 10 ++++++++-- 4 files changed, 28 insertions(+), 8 deletions(-) (limited to 'test/transform/resource') diff --git a/test/transform/resource/after-delombok/CleanupName.java b/test/transform/resource/after-delombok/CleanupName.java index cd29eb68..0201008e 100644 --- a/test/transform/resource/after-delombok/CleanupName.java +++ b/test/transform/resource/after-delombok/CleanupName.java @@ -4,7 +4,9 @@ class CleanupName { try { System.out.println(o); } finally { - o.toString(); + if (o != null) { + o.toString(); + } } } void test2() { @@ -12,7 +14,9 @@ class CleanupName { try { System.out.println(o); } finally { - o.toString(); + if (o != null) { + o.toString(); + } } } } diff --git a/test/transform/resource/after-delombok/CleanupPlain.java b/test/transform/resource/after-delombok/CleanupPlain.java index 35d51543..1a19442f 100644 --- a/test/transform/resource/after-delombok/CleanupPlain.java +++ b/test/transform/resource/after-delombok/CleanupPlain.java @@ -9,10 +9,14 @@ class CleanupPlain { out.flush(); } } finally { - out.close(); + if (out != null) { + out.close(); + } } } finally { - in.close(); + if (in != null) { + in.close(); + } } } } diff --git a/test/transform/resource/after-ecj/CleanupName.java b/test/transform/resource/after-ecj/CleanupName.java index 944a81e1..4011721b 100644 --- a/test/transform/resource/after-ecj/CleanupName.java +++ b/test/transform/resource/after-ecj/CleanupName.java @@ -10,7 +10,10 @@ class CleanupName { } finally { - o.toString(); + if ((o != null)) + { + o.toString(); + } } } void test2() { @@ -21,7 +24,10 @@ class CleanupName { } finally { - o.toString(); + if ((o != null)) + { + o.toString(); + } } } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/CleanupPlain.java b/test/transform/resource/after-ecj/CleanupPlain.java index 6754b4f6..fe8d7571 100644 --- a/test/transform/resource/after-ecj/CleanupPlain.java +++ b/test/transform/resource/after-ecj/CleanupPlain.java @@ -18,12 +18,18 @@ class CleanupPlain { } finally { - out.close(); + if ((out != null)) + { + out.close(); + } } } finally { - in.close(); + if ((in != null)) + { + in.close(); + } } } } \ No newline at end of file -- cgit