Attachment 46709 Details for Bug 145963 – tests patch containing readme detailing how to recreate the jar files

[patch] tests patch containing readme detailing how to recreate the jar files

pr145963-tests-patch.txt (text/plain), 10.75 KB, created by Helen Beeken

on 2006-07-24 11:12:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Helen Beeken

Created: 2006-07-24 11:12:43 EDT

Size: 10.75 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P tests
>Index: src/org/aspectj/systemtest/ajc152/CreatingModelForInjarTests.java
>===================================================================
>RCS file: /home/technology/org.aspectj/modules/tests/src/org/aspectj/systemtest/ajc152/CreatingModelForInjarTests.java,v
>retrieving revision 1.3
>diff -u -r1.3 CreatingModelForInjarTests.java
>--- src/org/aspectj/systemtest/ajc152/CreatingModelForInjarTests.java	20 Jun 2006 10:25:06 -0000	1.3
>+++ src/org/aspectj/systemtest/ajc152/CreatingModelForInjarTests.java	24 Jul 2006 15:13:27 -0000
>@@ -84,7 +84,7 @@
> 	public void testAdviceInRelMap() {
> 		runTest("advice and deow");
> 		IHierarchy top = AsmManager.getDefault().getHierarchy();
>-		IProgramElement adviceNode = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.ADVICE,"before()");
>+		IProgramElement adviceNode = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.ADVICE,"before(): p..");
> 		IRelationshipMap relMap = AsmManager.getDefault().getRelationshipMap();
> 		List adviceRels = relMap.get(adviceNode);
> 		assertFalse("expected before advice to have relationships but did not",adviceRels.isEmpty());
>@@ -101,6 +101,47 @@
> 		assertFalse("expected declare warning to have relationships but did not",dwRels.isEmpty());
> 	}
> 	
>+	public void testAdviceLabelsCorrect() {
>+		runTest("ensure advice label is correct");
>+		IHierarchy top = AsmManager.getDefault().getHierarchy();
>+		
>+		IProgramElement node = top.findElementForLabel(top.getRoot(), 
>+				IProgramElement.Kind.ADVICE, "before(): execM1()..");
>+		assertNotNull("expected to find ipe with label 'before(): execM1()..'" +
>+				" but didn't", node);
>+		
>+		node = top.findElementForLabel(top.getRoot(), 
>+				IProgramElement.Kind.ADVICE, "before(): execM2()..");
>+		assertNotNull("expected to find ipe with label 'before(): execM2()..'" +
>+				" but didn't", node);
>+		
>+		node = top.findElementForLabel(top.getRoot(), 
>+				IProgramElement.Kind.ADVICE, "before(): <anonymous pointcut>");
>+		assertNotNull("expected to find ipe with label 'before(): <anonymous pointcut>'" +
>+				" but didn't", node);
>+	}
>+	
>+	// ensure that filled in hierarchy only has one entry for
>+	// aspect
>+	public void testOnlyOneAspectEntry() {
>+		runTest("ensure advice label is correct");
>+		
>+		IProgramElement pkgNode = getPkgNode();
>+		assertEquals("expected one child node but found " + 
>+				pkgNode.getChildren().size(), 1, pkgNode.getChildren().size());
>+		
>+	}
>+	
>+	public void testOnlyOneAspectEntry_inDefaultPackage() {
>+		runTest("aspect in default package");
>+		// expect there to be two children - 'pack' and 
>+		// 'AspectInDefaultPackage.aj (binary)'
>+		IProgramElement defaultPkg = AsmManager.getDefault().getHierarchy().getRoot();
>+		assertEquals("expected two child node but found " + 
>+				defaultPkg.getChildren().size(), 2, defaultPkg.getChildren().size());
>+		
>+	}
>+	
> 	// --------------------- Helper methods ---------------------
> 	
> 	private IProgramElement getPkgNode() {
>Index: src/org/aspectj/systemtest/ajc152/injar.xml
>===================================================================
>RCS file: /home/technology/org.aspectj/modules/tests/src/org/aspectj/systemtest/ajc152/injar.xml,v
>retrieving revision 1.1
>diff -u -r1.1 injar.xml
>--- src/org/aspectj/systemtest/ajc152/injar.xml	12 Jun 2006 13:09:54 -0000	1.1
>+++ src/org/aspectj/systemtest/ajc152/injar.xml	24 Jul 2006 15:13:27 -0000
>@@ -9,5 +9,12 @@
> 	  </compile>
>     </ajc-test>
> 
>+    <ajc-test dir="bugs152/pr145963" title="ensure advice label is correct">
>+      <compile files="C.java" aspectpath="adviceLabels.jar" options="-emacssym"/>
>+    </ajc-test>
>     
>+    <ajc-test dir="bugs152/pr145963" title="aspect in default package">
>+      <compile files="C.java" aspectpath="aspectInDefaultPackage.jar" options="-emacssym"/>
>+    </ajc-test>
>+
> </suite>
>Index: bugs152/pr145963/aspectInDefaultPackage.jar
>===================================================================
>RCS file: bugs152/pr145963/aspectInDefaultPackage.jar
>diff -N bugs152/pr145963/aspectInDefaultPackage.jar
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/aspectInDefaultPackage.jar	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+PKö}Û4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
>+K-*ÎÌÏ³R0Ô3àår.JM,IMÑuª´Rp,.HM.ñRpÎÏ-ÈÌI-âåâåPK²ÔW97PKö}Û4AspectInDefaultPackage.classíUÍoEÿ?¿í¸i6MRè'¦?Ô®íF!mj]ªVM?£ "Kh¼$ë:»Ñî:	Ü?ÿ?*¡Hz0¢R{@'?wn\¸!oÆÇNÖjr	èç}óÞ¼ß÷fÞw~õ@yãWíe¡9·ëb×kÎ}®=ä"ÆÐWå+<SãÆBæ^¹JZaøñªÐ
>+Ý¹ÁõZÝ^·ÃÀÌ¶öì¢e®òrM\aêËÂ*êÆBM8¦qË°nhd24ãí¬"ÓZMúx?Á?cÌ
>+ôªÝLÛ)¨å8âÅàÃ¡8Eivá¨00Ñ
>+q·¾TÖ¬2ôÏ¯ÍqKß®04\Ç1 7à8¹wua\º/yÓ	oîl";Y©ä³aØ´Ò\éUÓ«¯+}µ²¢ËàÓkw³hV®Æ-îè¦±ÍwO¾s|6÷Zv¢|iOêùDnj>WÊÑ?7©Üg81ìS^!UïÎ¢pt-0"2
>+gFH5ãª6³q×lî{Í¬7×4±,ã,·Ôh[	
>+ægQ%çdjÎÇ?ÀCtÛÍmU¼#Ë?2+uK7tÑaïxÒ¼ÊpÞ#¢û¦n8ZÝiKÃÅ·Õ0',[©x&ÜåæeÞäX0
>+G¬9ÞÛôPt¸#pBÐÍõ!&Ë?fÃò¼iÐ¤=ô5N#£1þ%z!r;õ}Jâ'«~¥yHI|ô;Ð²Ì¸ÁTjùÜ¨)Ä?rÖi<LÆ~ ¯Ë,HË!±&´;Yà/÷?V§~¥ákÂ÷®HXWT p¤DR#Hl'
>+ì¢Aå[4n³PF®Æ¯ßºPü?ð«#Gü¢&[¼bJ²O^=ô{²Å«Á_é©Ø)ËT`¸m\ 25ØåÚâ¼iy)ÒÍw9?Ø¶?&»SxI=+áîÑÁ³iO°1¢&[gpHIöy½T§p´Î¨ui>©ªÜÄ¹oÑ÷ý¯n¢¯?Ñg$úBmº½S|(HulrÝÆÈîëþõ®Ö1Ù-:¬ÇæOà{ÐÀØcÛèj¦{%g¨s?vo_ÊªUctÌøî¤³Às²·p0?Ê¥_îÁzÞ·xsÑæ.Ú?	ì6·h?"|Jøð.Ê¢b-MJ6Q)\.ÑÃ¯/Û¢´jZm
>+CØ%÷a.YuÃÑÄÖRÉ;mi]¨ñ?§~÷%Ý¥>'ü@øð³<6y¬zðY0I"LÞ \|èb±y¡ùéÿpÏÝâK£[·ðu<ø[·á9]c§Ig9°®ÑÞ#¶i°?ªk´÷/^ÿ®ÑÞ#vÁ¥k^t?]ã_Ù5þPKA¿]îRPKö}Û4²ÔW97META-INF/MANIFEST.MFþÊPKö}Û4A¿]îRAspectInDefaultPackage.classPK?
>Index: bugs152/pr145963/C.java
>===================================================================
>RCS file: bugs152/pr145963/C.java
>diff -N bugs152/pr145963/C.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/C.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+package pack;
>+
>+public class C {
>+
>+	public void method1() {
>+		new C().method2();
>+	}
>+	
>+	public void method2() {
>+	}
>+	
>+}
>Index: bugs152/pr145963/adviceLabels.jar
>===================================================================
>RCS file: bugs152/pr145963/adviceLabels.jar
>diff -N bugs152/pr145963/adviceLabels.jar
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/adviceLabels.jar	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,6 @@
>+PKöyÓ4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
>+K-*ÎÌÏ³R0Ô3àår.JM,IMÑuª´Rp,.HM.ñRpÎÏ-ÈÌI-âåâåPK²ÔW97PKöyÓ4pkg/ConcreteAspect.classíUMlEþÆÿqÜü5ý	?¥-&uÜÖÆvBiSUCªÛ ¹¥XªÖëI¼¶³kí®pEgÄ	$¨i©¨DO©.pâ¸sã¼Ýø'Þ÷DØú<³oÞ÷Í¼·þñÕ×RehÖWÒyCWMnóËV«va¬¦¬)é¢¯¤Ê5iõ3L*55®é}EÑ-çÅ:Þ7ª¦±®|á¨por³¨é+
>+núëºe+ºJ!þÄ¹¨6ÄþüE@Þ¨?ûÜÉ°ì¼\!h>!ÐÍFz°ca´ éüzkµÌÍÂHÇ.ªÒXTLM<»ÆÐE:CbóSz»ªY	¾Ì
>+Ç÷^ÞñL<s®RÉeæ)Ã\I)Ò^Kse?©Ë5M:å±v?ÛU£ò
>+W©Ø¡w¸î7Ïe²/fæÊ³ûºæâÙóËÙÊÜù,]²CaaápbÆ»Ç¼Q+¾£ÛUnkjaDÄµ`8E®i×Õ¹ýë³ÏËFK¯¼º¡ò¦8XÏ:ý¶[Ï1$]=T´MêyÏ®Yõ9E	¡ªb9»È¹)zÊ--SåW4QÖñÞt)¥Æ0íq¼7M·ÕÝUãoÉatñ¬¸ËÉ+ÜáF¤l¾a{ß´¡h+6Ç	:R^W¢¢×i6%.Æ}ÈÊ0LOghd4ÆîbäSD®&·0¶)-~ ÙA\MîF¦ÝÈ`rG6eªI±cÄQ¬7xýxn² -øW¯e?Ý?yàg>j¸BSQëéü<y·Ëwï		?¸!bÄ<)é`KR=MØnè£9D¿Oµi^e¡6Íl_	¿íqß)Ïñ#~^ÃÒò¼ýé6¯:c~éü{bÓÂ«R+z(öÏ(Å	sÊÀ^´Fåd÷´<"ïQºÑcx¼Ëu~Nv&päN~±{/MLßÁØ6fîéK¹ig&ødq»{«¤6Jqß ¸í¿½gtTÈOôii§ù=ø¶qf'7÷ã¬¥¨ó?÷½ÿdD»'(Þ&T;Eb?}ª%B°@XÅóòîý"
>+~ïVñµÙec÷ávÙØ}HøðásdDÑXÛâc,å/H,µ¦ÅKëY·(7·J®Ìnk«ül{©¤È?ÂZåj?¾djNWêShÚ~p@öäMMÂQÛ	?~¦ó*²(?üÙÂ%ÂK<rt-oeo X?þwÔY÷íØKR}=ª¸Ó^ûHëî?^}l¤µ[H;4Yæ?%ÝBêÅëqÖn!íçýoÖÐÿÒú_Ö¿PK´BØ>FPKöyÓ4²ÔW97META-INF/MANIFEST.MFþÊPKöyÓ4´BØ>Fpkg/ConcreteAspect.classPK
>Index: bugs152/pr145963/AspectInDefaultPackage.aj
>===================================================================
>RCS file: bugs152/pr145963/AspectInDefaultPackage.aj
>diff -N bugs152/pr145963/AspectInDefaultPackage.aj
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/AspectInDefaultPackage.aj	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,18 @@
>+
>+public aspect AspectInDefaultPackage {
>+
>+	public pointcut execM1() : execution(* pack.C.method1(..));
>+	public pointcut execM2() : execution(* pack.C.method2(..));
>+	
>+	before() : execM1() && this(pack.C) {		
>+	}
>+	
>+	before() : execM2() || execM1() {
>+	}
>+	
>+	before() : execution(* pack.C.method1()) {
>+	}
>+
>+	
>+	
>+}
>Index: bugs152/pr145963/ConcreteAspect.aj
>===================================================================
>RCS file: bugs152/pr145963/ConcreteAspect.aj
>diff -N bugs152/pr145963/ConcreteAspect.aj
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/ConcreteAspect.aj	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+package pkg;
>+
>+public aspect ConcreteAspect {
>+	
>+	public pointcut execM1() : execution(* pack.C.method1(..));
>+	public pointcut execM2() : execution(* pack.C.method2(..));
>+	
>+	before() : execM1() && this(pack.C) {		
>+	}
>+	
>+	before() : execM2() || execM1() {
>+	}
>+	
>+	before() : execution(* pack.C.method1()) {
>+	}
>+
>+}
>Index: bugs152/pr145963/AbstractAspect.aj
>===================================================================
>RCS file: bugs152/pr145963/AbstractAspect.aj
>diff -N bugs152/pr145963/AbstractAspect.aj
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/AbstractAspect.aj	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+package pkg;
>+
>+public abstract aspect AbstractAspect {
>+
>+	public abstract pointcut abstractPCD();
>+	
>+	before() : abstractPCD() {
>+	}
>+	
>+}
>Index: bugs152/pr145963/SrcAspect.aj
>===================================================================
>RCS file: bugs152/pr145963/SrcAspect.aj
>diff -N bugs152/pr145963/SrcAspect.aj
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/SrcAspect.aj	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+package pkg;
>+
>+public aspect SrcAspect {
>+	
>+	pointcut p() : execution(* *.*(..)) && !within(pkg.*);
>+	
>+	before() : p() {
>+	}
>+	
>+}
>Index: bugs152/pr145963/README.txt
>===================================================================
>RCS file: bugs152/pr145963/README.txt
>diff -N bugs152/pr145963/README.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ bugs152/pr145963/README.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,8 @@
>+To recreate the jar files create AspectJ projects within Eclipse containing the
>+required files, right click and select 'Export > Java > JAR file with AspectJ Support'
>+
>+jar file					files contained in the jar file
>+--------					-------------------------------
>+adviceAndDeow.jar			A.aj, Deow.aj, Itd.aj, NewClass.java
>+adviceLabels.jar			ConcreteAspect.aj
>+aspectInDefaultPackage.jar	AspectInDefaultPackage.jar

Flags:

aclement: iplog+

Actions: View | Diff

Attachments on bug 145963: 43978 | 44793 | 45664 | 46709 | 47843 | 48269