AsmBuilderTest.testNullHandlingOfVisit() now checks for an NPE instead of an EmptyStackException. I'm not sure how the original could have worked in the absence of the handle cache.

1 files changed, 9 insertions, 4 deletions

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
index 43160e832..61d2b481d 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
@@ -60,10 +60,15 @@ public class AsmBuilderTest extends TestCase {
 		BlockScope scope = null;
 		
 		try { 
-			new AsmHierarchyBuilder(new CompilationResult(cu, 0, 0, 0)).visit(local, scope);
-		} catch (Exception e) {
-			assertTrue(e instanceof EmptyStackException);
-		}
+			new AsmHierarchyBuilder(new CompilationResult(cu, 0, 0, 0), null).visit(local, scope);
+		} 
+		catch (Exception e) {
+			assertTrue(e instanceof NullPointerException);
+		} 
+// XXX put back?
+//		catch (Exception e) {
+//			assertTrue(e instanceof EmptyStackException);
+//		}
 	}
 
 }