From: aclement <aclement>
Date: Thu, 21 Jul 2005 10:13:00 +0000 (+0000)
Subject: dont go looking for generic types pre 1.5
X-Git-Tag: V1_5_0M3~287
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=09a8a6b89a616d459e6a9851615f3a83c3f6356b;p=aspectj.git

dont go looking for generic types pre 1.5
---

diff --git a/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java b/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java
index 432e441cb..ab702e6b5 100644
--- a/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java
@@ -16,6 +16,8 @@ package org.aspectj.weaver;
 import junit.framework.TestCase;
 
 import org.aspectj.testing.util.TestUtil;
+import org.aspectj.testingutil.UtilTests;
+import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.bcel.BcelWorld;
 
 /**
@@ -106,17 +108,19 @@ public class TypeXTestCase extends TestCase {
 	}
 	
 	public void testTypeXForParameterizedTypes() {
-		World world = new BcelWorld();
-		UnresolvedType stringType = UnresolvedType.forName("java/lang/String");
-		ResolvedType listOfStringType = 
-			TypeFactory.createParameterizedType(
-							UnresolvedType.forName("java/util/List").resolve(world), 
-							new UnresolvedType[] {stringType},
-							world);
-		assertEquals("1 type param",1,listOfStringType.typeParameters.length);
-		assertEquals(stringType,listOfStringType.typeParameters[0]);
-		assertTrue(listOfStringType.isParameterizedType());
-		assertFalse(listOfStringType.isGenericType());
+		if (LangUtil.is15VMOrGreater()) { // no funny types pre 1.5
+			World world = new BcelWorld();
+			UnresolvedType stringType = UnresolvedType.forName("java/lang/String");
+			ResolvedType listOfStringType = 
+				TypeFactory.createParameterizedType(
+								UnresolvedType.forName("java/util/List").resolve(world), 
+								new UnresolvedType[] {stringType},
+								world);
+			assertEquals("1 type param",1,listOfStringType.typeParameters.length);
+			assertEquals(stringType,listOfStringType.typeParameters[0]);
+			assertTrue(listOfStringType.isParameterizedType());
+			assertFalse(listOfStringType.isGenericType());
+		}
 	}
 	
 	private void checkTX(UnresolvedType tx,boolean shouldBeParameterized,int numberOfTypeParameters) {