Tests and fix for Bugzilla Bug 54421

	  	Compile time declarations (warning and error) do not accept string concatenation (with +)

2 files changed, 78 insertions, 0 deletions

diff --git a/tests/bugs/decwStrings.java b/tests/bugs/decwStrings.java
new file mode 100644
index 000000000..ef392a669
--- /dev/null
+++ b/tests/bugs/decwStrings.java
@@ -0,0 +1,49 @@
+class WarningSample {
+
+	  public void method() {}
+	  public void anotherMethod() {
+	    this.method();
+	  }
+
+	}
+
+	aspect WarningAspect {
+
+	  pointcut illegalCall(): call(* WarningSample.method())
+	                && within(WarningSample);
+
+	  // the same thing happens with declare error
+	  declare warning: illegalCall() : "Hey, don't " +
+	      "do that, that is not nice. You should do something else";
+
+	  public void e1() {}
+	  declare warning: execution(* e1(..)): "hello " + /* comment */ "world";
+
+	  public void e2() {}
+	  declare warning: execution(* e2(..)): "hello " /* comment */ + "world";
+	  
+	  public void e3() {}
+	  declare warning: execution(* e3(..)): "hello " + // commenthere
+	  // comment here too
+	  "world";
+	  
+	  public void e4() {}
+	  declare warning: execution(* e4()): "hello " //xxx
+	  	+ "world";
+	  
+	  public void e5() {}
+	  declare warning: execution(* e5()): "hello " //xxx
+	  	/* here */
+	  	+ "world";
+	  	
+	  public void e6() {}
+	  declare warning: execution(* e6()): "abc" +
+ "def" + // def was here
+ "ghijklmnopqrstuv" /* silly
+place
+for a 
+comment */ +
+/* oops */
+ "wxyz";
+	}
+
diff --git a/tests/bugs/decwStringsErroneous.java b/tests/bugs/decwStringsErroneous.java
new file mode 100644
index 000000000..11664ac98
--- /dev/null
+++ b/tests/bugs/decwStringsErroneous.java
@@ -0,0 +1,29 @@
+class WarningSample {
+
+	public void method() {}
+	  public void anotherMethod() {
+	    this.method();
+	  }
+
+	}
+
+	aspect WarningAspect {
+
+	  pointcut illegalCall(): call(* WarningSample.method())
+	                && within(WarningSample);
+
+	  // the same thing happens with declare error
+	  declare warning: illegalCall() : "Hey, don't " +
+	      "do that, that is not nice. You should do something else";
+
+	  public void e1() {}
+	  declare warning: execution(* e1(..)): "hello " + /* comment */ "world"
+
+	  public void e2() {}
+	  declare warning: execution(* e2(..)): "hello " /* comment + "world";
+	  
+	  public void e3() {}
+	  declare warning: execution(* e3(..)): "hello " + // commenthere
+	
+	}
+