From e49b375f3b0d5d65b8a86d14298d0056fc289804 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Sat, 13 Mar 2010 01:02:47 +0000
Subject: [PATCH] 48080: inserts in messages

---
 tests/bugs169/pr48080/A.class                 | Bin 0 -> 352 bytes
 tests/bugs169/pr48080/A.java                  |   8 +++
 tests/bugs169/pr48080/Warnings.java           |  26 ++++++++
 tests/bugs169/pr48080/X.class                 | Bin 0 -> 2162 bytes
 .../systemtest/ajc169/Ajc169Tests.java        |  28 ++++++++
 .../org/aspectj/systemtest/ajc169/ajc169.xml  |  62 ++++++++++++++++++
 6 files changed, 124 insertions(+)
 create mode 100644 tests/bugs169/pr48080/A.class
 create mode 100644 tests/bugs169/pr48080/A.java
 create mode 100644 tests/bugs169/pr48080/Warnings.java
 create mode 100644 tests/bugs169/pr48080/X.class

diff --git a/tests/bugs169/pr48080/A.class b/tests/bugs169/pr48080/A.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c777108efd3d4496be7fbb0bc862527b3167a1b
GIT binary patch
literal 352
zcmZ9HOHRWu5QhIr(xik!OHTkh9+Gna5K>gcDlH38_fBfHj?x&pZaEh#Bo-WiLm?&x
z0b()F-}BA*{p0lwfWSCGK%hK9L>Sd_C$mPj%j~YKRpkirm2S1WCWNPFb3!yR3zZ_o
z-T*zsgkhmuHQTOBWgleOD8jffm2BqH>aPB7MsB4y3@P$U-nJ$PW0yj19(hSEo|N1v
zE2he=%;H8>jkMBf)Bdsv>Al(7O5N&iN1Ti9RGfgB{0|`Dj1OX;aFuZ+j=l32^q;+)
svhQTD?Xw?zJ>YoYdxxwB7;@fc3)qf5>cXo$^&b=d!O#z8<cE(w0fWLilK=n!

literal 0
HcmV?d00001

diff --git a/tests/bugs169/pr48080/A.java b/tests/bugs169/pr48080/A.java
new file mode 100644
index 000000000..c8576ca79
--- /dev/null
+++ b/tests/bugs169/pr48080/A.java
@@ -0,0 +1,8 @@
+public class A {
+  public void m() {
+  }
+}
+
+aspect X {
+  declare warning: execution(* A.m(..)): "method found";
+}
diff --git a/tests/bugs169/pr48080/Warnings.java b/tests/bugs169/pr48080/Warnings.java
new file mode 100644
index 000000000..805bc4129
--- /dev/null
+++ b/tests/bugs169/pr48080/Warnings.java
@@ -0,0 +1,26 @@
+package p;
+
+aspect Checker {
+  declare warning: execution(* A.m(..)): "joinpoint location is {joinpoint.sourcelocation.sourcefile}:{joinpoint.sourcelocation.line}";
+  declare warning: execution(* A.m(..)): "joinpoint is {joinpoint}";
+  declare warning: execution(* A.m(..)): "joinpoint kind is {joinpoint.kind}";
+  declare warning: execution(* A.m(..)): "joinpoint kind is '{joinpoint.kind}'";
+  declare warning: execution(* A.m(..)): "joinpoint line is '{joinpoint.sourcelocation.line}'";
+  declare warning: execution(* A.m(..)): "joinpoint signature is {joinpoint.signature}";
+  declare warning: get(int *) && within(A): "joinpoint signature is {joinpoint.signature}";
+  declare warning: execution(* A.m(..)): "joinpoint declaring type is {joinpoint.signature.declaringType}";
+  declare warning: execution(* A.m(..)): "advice sourcelocation is {advice.sourcelocation.sourcefile}:{advice.sourcelocation.line}";
+  declare warning: get(int *): "aspect is {advice.aspecttype}";
+  declare warning: get(int *): "signature name for field is {joinpoint.signature.name}";
+  declare warning: execution(* A.m(..)): "signature name for method is {joinpoint.signature.name}";
+  declare warning: execution(* A.m(..)): "\\{}wibble";
+  declare warning: execution(* A.m(..)): "{}foobar"; 
+  declare warning: execution(* A.m(..)): "test {advice.sourcelocation.line}\\{}{joinpoint.sourcelocation.line}";
+}
+
+class A {
+  int i;
+  public void m() {
+    System.out.println(i);
+  } 
+}
diff --git a/tests/bugs169/pr48080/X.class b/tests/bugs169/pr48080/X.class
new file mode 100644
index 0000000000000000000000000000000000000000..1f95cc99c3626e55a1aae474d06e6ff090e6e758
GIT binary patch
literal 2162
zcmeHH&u<$=6#mA)?JP7+TbdSVQz&WTfSrgc6cSN|KqZ7p5w1d8Sw!Q_G+yKETD#+<
zJ@9|<7r><l+8%<a1UHa4^~#z51Nh#q$vWVI#1%$*JM-Sm``(-Hz1g3B{q{QmH7pg8
zQBXIF$SF*A^`5Txw7*lo-tHRLDxB0^_oC-}_L}y3gV3z&L1Yw8HPWLuI$^M{+dZ?Q
zP;TDyZO2&8RhSmnz6qP2ztb}|@Za|%t9_U5*~U#CF0Hyffqt8Yx%o|n+<LHWDo}XV
z!7)s5jv<1`uEz(<+&b<ck3tbA6i$rELE%`#^UcO!w{5~3l9j?#BXD(ZQ-_}DLt|kz
z4qZVO(+-}KXgS;QB1Vv)+s5tb&}^Ate``sh7KA%B9rejcx3+Keo(XFo8ruoB-;EDy
z>ji!qSmE3lhqdkqJEa8e`W=P*+&uY^%gs0_p<KjE3YQ2_A4W_{vJtGs3A_^w{O$Md
zx~4BdOUP7k0k6m%W)-S)Bb8~|kle3~SkhVv-{p>u63n;)w}tv?g-SCRgs!>f33-LJ
zn$WCpcFc{E%k$LCn9WaOnl?=sF-?UtV~+e0e4Kld#CqUcbC-=cj?g4R(`su-0q?+;
z&Y&U<Laj&*I3tW6Y6WT)Oi*{Y_bO+_+4%;~e1*~n)km0o5L>cDnBwXrcLhtnkS^g`
zJnNjrny((<^aCz3IK{7%7#Xxo?WprvI_HK-J<r_|MN+(q7x)!lV1XjADuGM^iX-r(
zGKMeXMVw>c)cp+xka7AU&i{zX$GC87>g9)+Jix{8Y5JO5nUSpcjAIK3cL{SxpsH~m
zK!tukAfLORz5i72iab`5pAep=vp_@{6OW;89bo<u&j0ydX$l2Y;{Xe+3J{RqtT2H*
ze^1%Q+Dc5;Z^J=*i}ESdE>teH{&gie-KMlDA5mO5yYai7xg*brma7zt*Z6gk8>rcj
zKmX+m{u{}QIz+5fZDD!it=4`Jeirq$YogZheJ(9;z234WvQeu&*ol^w-)!~6%U2e!
zEVh!@LtiQPamp-3$}I4UlvT<e<(_DnpPO8AWS+$8m;b7*FB3qxds<tM_CVpV2mYbG
W(_Tzmj<!1Re|!IJd*}b_?fpAbf}+3x

literal 0
HcmV?d00001

diff --git a/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java b/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
index 54872e40d..2d04b660a 100644
--- a/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
@@ -18,6 +18,34 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	/*public void testAmbiguousMethod() {
+		runTest("ambiguous method");
+	}*/
+
+	public void testChecker() {
+		runTest("inserts in messages");
+	}
+/*
+	public void testVerifyError() {
+		runTest("verifyerror on atAj");
+	}
+
+	public void testDeclareTypeWarning1() {
+		runTest("declare type warning - 1");
+	}
+
+	public void testDeclareTypeWarning2() {
+		runTest("declare type warning - 2");
+	}
+
+	public void testDeclareTypeWarning3() {
+		runTest("declare type warning - 3");
+	}
+
+	public void testDeclareTypeError1() {
+		runTest("declare type error - 1");
+	}*/
+
 	public void testPr298388() {
 		runTest("declare mixin and generics");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml b/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
index 9f2408c2a..c3e79969e 100644
--- a/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
+++ b/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
@@ -2,6 +2,38 @@
 
 <suite>
    
+   <ajc-test dir="bugs169/pr48080" title="inserts in messages">
+     <compile files="Warnings.java" options="-1.5">
+       <message kind="warning" text="UNKNOWN_KEY{}foobar"/>
+       <message kind="warning" text="{}wibble"/>
+       <message kind="warning" text="signature name for method is m"/>
+       <message kind="warning" text="joinpoint declaring type is p.A"/>
+       <message kind="warning" text="joinpoint signature is void p.A.m()"/>
+       <message kind="warning" text="joinpoint line is '23'"/>
+       <message kind="warning" text="joinpoint kind is method-execution"/>
+       <message kind="warning" text="joinpoint kind is 'method-execution'"/>
+       <message kind="warning" text="joinpoint is method-execution(void p.A.m())"/>
+       <message kind="warning" text="joinpoint location is"/>
+       <message kind="warning" text="signature name for field is i"/>
+       <message kind="warning" text="joinpoint signature is int p.A.i"/>
+       <message kind="warning" text="aspect is p.Checker"/>
+       <message kind="warning" text="advice sourcelocation is"/>
+       <message kind="warning" text="test 18{}23"/>
+     </compile>
+  </ajc-test>
+  
+   <ajc-test dir="bugs169/pr299062" title="verifyerror on atAj">
+     <compile files="Test.java Work.java SmartAspect.java Idempotent.java" options="-1.5"/>
+     <run class="Test">
+     </run>
+  </ajc-test>
+  
+   <ajc-test dir="bugs169/pr298665" title="ambiguous method">
+     <compile files="Main.java" options="-1.5"/>
+     <run class="Main">
+     </run>
+  </ajc-test>
+  
    <ajc-test dir="bugs169/pr298388" title="declare mixin and generics">
      <compile files="PR298388.java" options="-1.5"/>
      <run class="PR298388">
@@ -25,4 +57,34 @@
      </run>
   </ajc-test>
   
+  <!-- declare type warning -->
+  
+  <ajc-test dir="bugs169/pr291206" title="declare type warning - 1">
+     <compile files="One.java" options="-1.5">
+       <message kind="warning" line="8" text="Nothing should be"/>
+     </compile>
+  </ajc-test>
+  
+  <ajc-test dir="bugs169/pr291206" title="declare type warning - 2">
+     <compile files="Two.java" options="-1.5 -XhasMember">
+       <message kind="warning" line="7" text="Missing foo()"/>
+       <message kind="warning" line="13" text="Missing foo()"/>
+     </compile>
+  </ajc-test>
+  
+  <!-- testing build of model with one of these in -->
+  <ajc-test dir="bugs169/pr291206" title="declare type warning - 3">
+     <compile files="Two.java" options="-1.5 -XhasMember -emacssym">
+       <message kind="warning" line="7" text="Missing foo()"/>
+       <message kind="warning" line="13" text="Missing foo()"/>
+     </compile>
+  </ajc-test>
+  
+  <ajc-test dir="bugs169/pr291206" title="declare type error - 1">
+     <compile files="Three.java" options="-1.5 -XhasMember">
+       <message kind="error" line="7" text="Missing foo()"/>
+       <message kind="error" line="13" text="Missing foo()"/>
+     </compile>
+  </ajc-test>
+  
 </suite>
\ No newline at end of file
-- 
2.39.5