From d494f7fd436543dc3cf052f289220a9d2156f110 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 14 Jun 2005 15:17:16 +0000
Subject: [PATCH] Updated with a simple erasure test case - will need more
 later!

---
 bcel-builder/testdata/ErasureTestData.java    |   7 +++
 bcel-builder/testdata/testcode.jar            | Bin 16370 -> 16210 bytes
 .../apache/bcel/classfile/tests/AllTests.java |   1 +
 .../tests/GenericsErasureTesting.java         |  50 ++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 bcel-builder/testdata/ErasureTestData.java
 create mode 100644 bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericsErasureTesting.java

diff --git a/bcel-builder/testdata/ErasureTestData.java b/bcel-builder/testdata/ErasureTestData.java
new file mode 100644
index 000000000..493f59a14
--- /dev/null
+++ b/bcel-builder/testdata/ErasureTestData.java
@@ -0,0 +1,7 @@
+import java.util.*;
+
+public class ErasureTestData {
+
+  public Vector<String> getData() { return null; }
+
+}
diff --git a/bcel-builder/testdata/testcode.jar b/bcel-builder/testdata/testcode.jar
index d954f728a1d02c0dd032735e74982b863ec87c3b..884ed866fd65ab5421e60f4962affe8275db6fa9 100644
GIT binary patch
delta 2870
zcmah}2~bm46n!rN6T*@x!7L=9Bmpe4lr$k=LqKsIg~5$VRctJ=BAaEYD6RAlB2%<l
zecCE@88Nk1v6g=66t#$TIv`q9)K)9FwP-t~g8MFg9|!+`2~OY4pFe-jx#!;d?!V_&
zY1>l&l!<&d5dc64v<q7eJGV6~>cwC4AplbJZM3Y`0O3$BBURhcF2?9KNT<Ot67woC
zZj@o{A*6TnOe9uu*=_IN7^~#dgWN<sC0Fwgi!f5iVE9o3bl4m~rwtO3@y)Ue$0Qi1
zA^ou+j>H~s-@3&cV=ExtC5(cE_LWKBEcgv~G#%qAfWD5=AiL;1(NY4Hp=BsjAj<H3
zL_~*;(2rxF^yigXVgt}uUgs6u;!~}60EOW)9smL8kVKBQ#ER%+-er)W?OB&O_8C^%
z$kf5m=+$BY*+yOX=TVz6e3VBYlpG<$i%Z^;O~#lNXJNt>^x+|CWVn0V+Ic5&h6xZQ
zNPCD5v!CUjO2pAOAf4(rj|}s+mN$4}>;$B*4h@B++}@&X>SZE~?Zl5CmL8LDD=5mh
zPqP;kj<yxrBHqci6%^!rdMvptLAt#6$d@x}?#-Rks5Xtgx<ARBo;q4)>=4Hs&XlaR
z_0$*I+seh46BXihqZ2p%T>s>H@3o9;|CIE4TviqYMDNhd)3gf9)`ym^OY`k|yEZ7s
z+==unb<>+G9tEvgqFcLZecH4g+DoE6RSmxC+clv-8TX&A-c{G$+|n-6edZR4awcpL
zte78?K4ymh`ihwwtESL4`R*FY@>fUothN`W<WJ79W$z39uCppCJ|b&#OUc=;t@rPx
zo0^3_vzCs^8@u62`hyK!#U9gJZ8zr_n|LO96I>Md?$xgJ4?enhp|<J0la<k{VpjPK
z^14zGtfJ@E_1Fb7@BFIkh<BV_6O!{`%kMwz363YXDNAxjm4^qG<whIi6+B`j(UF6z
zpW-WB2I)&mKXN1w1Bcz+hp`}tl&Uu3hlFjHw%23GgeMXJ(0EHAGOG^|%KE5X0-BFu
zA6l+C%O}H+7JYFShiBq&B|se(6?$EJp9t^tZV}wZl;x04(G4aGD_i34%V5QjuF!jt
z*un3c9z4d)2D#JqLB4!Kv)bNuYClft#iwr#>mV0Yw$*wv8OIsi08juFY4xY2!&Au1
z>WRO3{T$9a1ER|CCxmqC`w4$(uyi-1Ya*h_k`h%T!_Qz0@M+;|-6U4Yml|s^*2|;S
zhT|m0FQ0fi7Gtw`wAeV6ELWOV7yJvBOu#t4!NzzM+G#p54DzJ>m)IyK_a6s^_C~8i
zI84?~pKln;jDl!3l!c{CB&Au81z>1D8^0Y?0T1ov$;D0qXtr6wcTf#zu{n^NnDks$
z$U$9n#}2F)u|=Y8v%<|m1q#q7f)JO2So38JmOT!tP>6bj8kd4r#xQCJJg^t*xD~NB
z41hnYgF8DeLi0V<ND}MLttudv(P{TYmRLPkhcIM9=Y|(*l*q6@i@AKlnF)T4Pahu}
zwM!Fl1e5$vF($m?0w(o=KMuyA-1yuiou*=7%^CnXk#xK-0BDoIb&wr>s>xFHXoR+u
zosNMuZ~$b4R15a(#Jrq^+4ka*xw(0Tw!+N3+=1(HcKUuD2PMLqF23)}7{60bDC-SH
zse>Aa+Zk`q&dz%?FF!luCD~q>9{`g6RQQc=R0%+mEkDbiF>Uce`@qqxJvy&|7^;v)
z<$86)EzAzwN8>CZ+{v>}$?P(F9Mr#Rq|&Hd2HV)Da}Kpzw8@+au$Jjukh>0mshP|K
z{$~JaQk){#L51o2`H9R857<9i5vLgGppt|7sbg}Bat34?Sl@MCsYR$WP8ZDSfwW=n
zT`WKmR>C@1H+J6m?l80}Tr=G1$1t!S?L2OX4q4^grM_ZiCY6MqTK&0`V%-`5ydN))
ygPIbB0u6pHDOn2#V8{zP^M@HxX}prFO*%Tubx@m)*x&U&I-mnp9spFE81O$@zP086

delta 3014
zcmai$eQZ-@6vp4SD{Z%S>uAgEUE5pMbsqu7(z<rtXv>xfYBtRj1tG{sTo=a*n<FSn
zA|Z2<Fl5GqF~s09W+E|uWVvFZAte5VfCw8y6rEs<U(rBOiQ<rX-bLNH>v+BWr|JDY
z=REIu-}~H-KJ&{?PfL>_$H~n2*}LwgFe8@}PDiBSuuiwYWIjB2?8!;I_n3~c+bdiQ
z>`_T=)fMW>Oy-q=@h=OI9~5ZRK7E9<)*aOcB;;<0*iQ|)di1jUa?U$HBDcpN^5SFg
zRn)J_b8>n8Z{p@EGuMdf*P0TX{Yd)alpQ%$#O^hRI6E;k@Tv{DJ^>5oEE8z^>*lvN
zUBD4OBtRMS;0R+rFy?)ZlKNe(0WNt!D8ZGkj`=~da>=5);9Xp@PAKs+xE6E6(U?VD
zXzSq{yfXP4+l87Qy=bUju2Y7-%jc4}_O~y;g{=+<TPa*3sgnIL*Bq&QIdl;D6aU{v
zQZt2X_>8yjSR>t!nxsGj8yp!#jiWENokdIc2rQ{>&Ngl(eQV1|BXU;+EMpRb4Rx|Q
z>9TPvwq)<IJmk*^H0pZyZauOc_AzfKTJFfX{Y2H9MJ`@9T2*-HFZBJape~eqM-jbI
zTygzfL`y|zf$uV+y3tER?;{!!psG<hZ$LH}dc&mR1Le;bxXlzx+^z1!wpXrW-F8u3
zU&&Mmd}}*t`W4ydMC_eGE3e!0w8z2O?IO0V)WQ88eed`m6FA*cqrh)}#W>&TL#dxf
zKERq*VPMD%`V$^?a6t>-J!v3$_CBm17VI9FDsLj1S$ggJ&(QY6BHQxfC|}|yPt^aQ
zAa_;7rmC)T+l}6a$}!}a(6)oYK+>i5gj8OCkHJ|zjG9Tov!XWNv4Yn(^fsNVMRu)#
zWvqz7{H0zvUwy`BGCNlvDLajh>Zk1M^iKBQs{@83G8Tf5BfhffU&Hhz;6ml})c^%i
zUpYbPJ7C^4hu=UC{d)JJmL^TdFntlo8o?C<Tr_wJW(eTJsEpgG%)vK9Fn78$SZnz2
zkDDN2Du<RDBfYnN>fV?cUN9?J4rr!(H4YZ$!UapVfF`;}BWTXU;1AHw@fdfNwqm*m
z>6~a(`!zN8+5U<3e9F_D)|y;ffP4w<snqhGui1HKN5a9-;z!dPw{D#=$1qJ~ZN=y3
zawTL6O<A*|+3eQXu5iLgt)E(^*{mH?(gmBGzO3Rjm?cf|lk+gZ6}rY#b@EO;*XZHy
zR65<cs<S)YI{P|lEZa3zj~6j^@5b(qRO^FJb){xk)1=m(XT1fdHYM+d`WhEC*SAE*
z$Nf)ueMvbT2#sfKO)mv3iZ|=1&yVvu6A+IFXdN2IT2HYOC@yi&JpFIR<ub-PgN&_c
z-`tf>HS*&y>vG|zxZHq$_DcUnmu=a$c~&w^^H{sP7hzeVgvJMrVeKP64*L?tbZIn(
zwTH6167nh)zBF2zMzMBt_k%y_rkm1`<ipIsBS{bKNW<1aw}ctP7|KPo8x7mJ8uoX%
dlq{lUX~=5#x+{WN9Lx`}09$2YtT)OF{S7$-3qt?^

diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AllTests.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AllTests.java
index ff170ab07..f7ef2ab46 100644
--- a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AllTests.java
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AllTests.java
@@ -50,6 +50,7 @@ public class AllTests {
 		suite.addTestSuite(TypeAnnotationsTest.class);
 		suite.addTestSuite(UtilTests.class);
 		suite.addTestSuite(GenericSignatureParsingTest.class);
+		suite.addTestSuite(GenericsErasureTesting.class);
 		//$JUnit-END$
 		return suite;
 	}
diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericsErasureTesting.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericsErasureTesting.java
new file mode 100644
index 000000000..37883221d
--- /dev/null
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericsErasureTesting.java
@@ -0,0 +1,50 @@
+/* *******************************************************************
+ * Copyright (c) 2005 Contributors
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Andy Clement (IBM)     initial implementation 
+ * ******************************************************************/
+package org.aspectj.apache.bcel.classfile.tests;
+
+import org.aspectj.apache.bcel.classfile.Attribute;
+import org.aspectj.apache.bcel.classfile.JavaClass;
+import org.aspectj.apache.bcel.classfile.Method;
+import org.aspectj.apache.bcel.classfile.Signature;
+
+/**
+ * Should be possible to recover original declared signatures after erasure by using
+ * the signature attribute.
+ */
+public class GenericsErasureTesting extends BcelTestCase {
+	
+	
+	public void testLoadingGenerics() throws ClassNotFoundException {
+		JavaClass clazz = getClassFromJar("ErasureTestData");
+		Method m = getMethod(clazz,"getData");
+		String sig = m.getDeclaredSignature();
+		System.err.println(getSignatureAttribute(clazz,"getData"));
+		System.err.println(sig);
+		assertTrue("Incorrect: "+sig,sig.equals("()Ljava/util/Vector<Ljava/lang/String;>;"));
+	}
+	
+	
+	// helper methods below
+	
+	public Signature getSignatureAttribute(JavaClass clazz,String name) {
+		Method m = getMethod(clazz,name);
+		Attribute[] as = m.getAttributes();
+		for (int i = 0; i < as.length; i++) {
+			Attribute attribute = as[i];
+			if (attribute.getName().equals("Signature")) {
+				return (Signature)attribute;
+			}
+		}
+		return null;
+	}
+	
+}
-- 
2.39.5