From 293a0756b25fd1e9c7cd2623d2e28e78aa797f06 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 1 Apr 2011 03:46:11 +0000
Subject: [PATCH] 341446: adjust test structure to avoid inclusion of incorrect
 (level50) classes in packaged jars

---
 org.aspectj.matcher/.classpath                   |   1 -
 org.aspectj.matcher/testdata/testdata.jar        | Bin 1241 -> 0 bytes
 .../CommonAdvancedPointcutExpressionTests.java   |   8 --------
 .../{ => testsrc}/testdata/AnnotatedClass.java   |   0
 .../testdata/MethodLevelAnnotation.java          |   0
 .../{ => testsrc}/testdata/SomeAnnotation.java   |   0
 6 files changed, 9 deletions(-)
 delete mode 100644 org.aspectj.matcher/testdata/testdata.jar
 rename org.aspectj.matcher/{ => testsrc}/testdata/AnnotatedClass.java (100%)
 rename org.aspectj.matcher/{ => testsrc}/testdata/MethodLevelAnnotation.java (100%)
 rename org.aspectj.matcher/{ => testsrc}/testdata/SomeAnnotation.java (100%)

diff --git a/org.aspectj.matcher/.classpath b/org.aspectj.matcher/.classpath
index 544d974e4..856780f91 100644
--- a/org.aspectj.matcher/.classpath
+++ b/org.aspectj.matcher/.classpath
@@ -8,6 +8,5 @@
 	<classpathentry kind="src" path="/bridge"/>
 	<classpathentry kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="testdata/testdata.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.aspectj.matcher/testdata/testdata.jar b/org.aspectj.matcher/testdata/testdata.jar
deleted file mode 100644
index 7bbb39068f512b5429dace0324523a439ff8b239..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1241
zcmWIWW@h1H00H6HE=w>2N^ml;FqEVgm!u??B<lY=#lR2%R4T&20fgvEWr14YN*(j^
z@=Fp+Qd69B5{rxVl0jr?z-h0;4kEVZp2EFXukD(k$8vWiH*=o0lje>tuCQJ6O`82Y
z(-zG9vVWIQ%n!!DD<1i3t>m9`bZ7tP9R{nv{$_8;{^GRb1<MOI3zZ+{UfR{(1?TnE
zSn^YXJYO8~I^AyM|Kv}kO5|3-C~56AKJS;-nrbfmACk4Y$TF}s>14rS?Zw=OGILTB
zgA-l1OgvtsxOr`g!;8$t?fZ=nZ`6DqT)BMJWOrWMQ!arqXOB32xS9Lq#*_Q!_-=i;
zpd@4d$KQTow5rR@3;Gw6jV1?o8(aL5yjtuyb?(LIFI%(=b7S{4PP-$(<hDPqs>fQV
zG%Is|+Q)FQgzu~Qv(wgl{=Y6%ls0>H^WS4N3^hyv-s~K!6gP{rGcqvj24dVHs)8J%
zzNsY{`6)iBWvMyPz|G9hg9L1=-|jpnM;;mH1ZEZ&=`IyfRrQO@yc|_j<StIUpx@5g
zZMHk;T)EJGw}b2-0z3AK#5A`o-KcxM=k4X61uO<G?hBWGSaLzlMBMJT_m9gFYG0P=
zMDL$haPHe-OZ}*x^5(hcOdndFn=>OmZq}7GI@4>sDrSq!I+3-#^UKtZB(XBr?|v(u
z-b#Du_P_7T>FCLCnjMeYZ+`!=#HB*eFLkY}yZL|RlG9T^U+oiC+;eYF(5zn!3xxt)
z1x0QCJePX4aNFS+RvRO!j5uI8uycq^yQX~%=xYnS;ewLVg7b4z(F4T#YyNdRHa0e8
zHoG#myfQYqGPXE3wsjBwTw3%bWc!&pA#Q9BAN;u!a(vI8Ka-A3I`hY7@0uf<T-?}B
zF1WO3(wRF~Hk^5MW{Hf-&m=cCR{051f9D+8Q}WkkM@wBmmS>h+N9x%V2co9U2<9@0
z>20{w@Mq4MCteHKzAXsYFW?^^?#A|U(v?S(rW~2%QXA54XvCp#=9B*^FJHaHlnKYP
zY@8-bF*7SO3kw(<H!uh@bI(XgO<=yX$Dy!H;h9J3gOmqM;Gp2Tb8^A~U{Gj*gMyKX
zivf2I1u8=V@JtBFuZ&D042T?yobo{7hydC^CR{7F{2SnnY7}y0fs!f$)B@cMHwsU}
iMK=-I&!~=@%7kPhwkQwqW@Q68fCUJZfz~fz2Jrws*RtCH

diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java b/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
index e5fa8b0c0..2d3669748 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
+++ b/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
@@ -25,14 +25,6 @@ import org.aspectj.weaver.tools.StandardPointcutParser;
  * 
  * This is based on the Reflection oriented PointcutExpressionTest in the weaver project.
  * 
- * TESTDATA. The testdata for these tests is kept in org.aspectj.matcher/testdata. It is a series of .java files that need to be
- * compiled and available at runtime. Since they are java5 (they include annotations) they cannot be in a source folder for the
- * project, so they are compiled separately and then jar'd into a testdata.jar file in that folder. This folder is defined to be on
- * the classpath for org.aspectj.matcher, this enables them to be seen by a simple world that uses the classpath of the matcher
- * project as the definition of what it can see. Other worlds, for example JDT World, will need to have those types defined in a
- * project that is accessible in the JDT World instance. Because these tests exercise Java5 matching, the concrete ReflectionWorld
- * subtype is not defined in here, it is defined in weaver5 (messy, but works well).
- * 
  * @author Andy Clement
  */
 public abstract class CommonAdvancedPointcutExpressionTests extends TestCase {
diff --git a/org.aspectj.matcher/testdata/AnnotatedClass.java b/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java
similarity index 100%
rename from org.aspectj.matcher/testdata/AnnotatedClass.java
rename to org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java
diff --git a/org.aspectj.matcher/testdata/MethodLevelAnnotation.java b/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java
similarity index 100%
rename from org.aspectj.matcher/testdata/MethodLevelAnnotation.java
rename to org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java
diff --git a/org.aspectj.matcher/testdata/SomeAnnotation.java b/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java
similarity index 100%
rename from org.aspectj.matcher/testdata/SomeAnnotation.java
rename to org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java
-- 
2.39.5