From: acolyer <acolyer>
Date: Wed, 13 Jul 2005 13:02:54 +0000 (+0000)
Subject: test case updates...
X-Git-Tag: PRE_ANDY~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1ab443592497bf1281618ee7666ac10c3b81eefa;p=aspectj.git

test case updates...
---

diff --git a/weaver/testsrc/org/aspectj/weaver/TypeVariableTestCase.java b/weaver/testsrc/org/aspectj/weaver/TypeVariableTestCase.java
index 37df88221..ec4a19101 100644
--- a/weaver/testsrc/org/aspectj/weaver/TypeVariableTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/TypeVariableTestCase.java
@@ -65,15 +65,6 @@ public class TypeVariableTestCase extends TestCase {
 		assertEquals("resolved double",javaLangDouble.resolve(world),tv.getLowerBound());
 	}
 	
-	public void testDoubleResolve() {
-		TypeVariable tv = new TypeVariable("X");
-		tv.resolve(world);
-		try {
-			tv.resolve(world);
-			fail("Should throw illegal state exception");
-		} catch (IllegalStateException ex) {}
-	}
-	
 	public void testBindWithoutResolve() {
 		TypeVariable tv = new TypeVariable("X");
 		try {
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
index 85d08e211..724e331bc 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -402,7 +402,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with handler pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 	
@@ -412,7 +412,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with 'this' pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 	
@@ -422,7 +422,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with target pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -432,7 +432,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with args pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -442,7 +442,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with if pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -452,7 +452,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with cflow pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -462,7 +462,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with cflowbelow pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -472,7 +472,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with @within pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -482,7 +482,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with @annotation pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -492,7 +492,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with @withincode pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -502,7 +502,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with @this pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 	
@@ -512,7 +512,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with @target pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}
 
@@ -522,7 +522,7 @@ public class ParserTestCase extends TestCase {
 			parser.parsePointcut();
 			fail("Expecting parse exception");
 		} catch (ParserException pEx) {
-			assertEquals("( - type variables not allowed with @args pointcut designator",pEx.getMessage());
+			assertEquals("(",pEx.getMessage());
 		}		
 	}