From 4295fcd68c0fc746a7788da28a6ed7ae5274d34a Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 5 Aug 2004 13:11:36 +0000 Subject: [PATCH] No really, this *is* the last fix that will make the build work. --- .../org/aspectj/ajde/SavedModelConsistencyTest.java | 9 +++++---- asm/src/org/aspectj/asm/internal/RelationshipMap.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java b/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java index faa095054..689381523 100644 --- a/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java +++ b/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java @@ -49,14 +49,15 @@ public class SavedModelConsistencyTest extends AjdeTestCase { assertTrue(testFile.exists()); IProgramElement nodePreBuild = model.findElementForSourceLine(testFile.getAbsolutePath(), 5); -// System.err.println(nodePreBuild.getKind()); + //System.err.println(nodePreBuild.getKind()); doSynchronousBuild(CONFIG_FILE_PATH); IProgramElement nodePostBuild = model.findElementForSourceLine(testFile.getAbsolutePath(), 5); -// System.err.println(nodePostBuild.getKind()); + //System.err.println(nodePostBuild.getKind()); - assertTrue(nodePreBuild.getKind().equals(nodePostBuild.getKind())); + assertTrue("Nodes should be identical: Prebuild kind = "+nodePreBuild.getKind()+ + " Postbuild kind = "+nodePostBuild.getKind(),nodePreBuild.getKind().equals(nodePostBuild.getKind())); } @@ -88,7 +89,7 @@ public class SavedModelConsistencyTest extends AjdeTestCase { // System.err.println(preBuildKinds); // System.err.println(postBuildKinds); - assertTrue(preBuildKinds.equals(postBuildKinds)); + assertTrue("Lists should be the same: PRE"+preBuildKinds.toString()+" POST"+postBuildKinds.toString(),preBuildKinds.equals(postBuildKinds)); } diff --git a/asm/src/org/aspectj/asm/internal/RelationshipMap.java b/asm/src/org/aspectj/asm/internal/RelationshipMap.java index b70887af6..6fb5b74c4 100644 --- a/asm/src/org/aspectj/asm/internal/RelationshipMap.java +++ b/asm/src/org/aspectj/asm/internal/RelationshipMap.java @@ -111,7 +111,8 @@ public class RelationshipMap extends HashMap implements IRelationshipMap { super.remove(source); } - public Object put(Object o, Object p) {throw new RuntimeException("Fuck off!"); + public Object put(Object o, Object p) { + return super.put(o,p); } public void put(String source, IRelationship relationship) { System.err.println(">> for: " + source + ", put::" + relationship); -- 2.39.5