Reverted code in this branch to use the old interpreter. The other changes
after release 4277 (when the new interpreter was introduced) have been kept
intact.
Some unit tests still fail, but this is not surprising since they these
unit tests were deleted or commented out when the new interpreter replaced
the old interpreter, and I just resurrected them.
The errors are:
[junit] GlobalModelOtherTest 36.269 sec
[junit] Testsuite: edu.rice.cs.drjava.model.GlobalModelOtherTest
[junit] Tests run: 18, Failures: 6, Errors: 0
[junit] Testcase: testInteractionAbort(edu.rice.cs.drjava.model.GlobalModelOtherTest): FAILED
[junit] number of times interactionEnded fired expected:<1> but was:<2>
[junit] junit.framework.AssertionFailedError: number of times interactionEnded fired expected:<1> but was:<2>
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase$TestListener.assertInteractionEndCount(GlobalModelTestCase.java:687)
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase.interpret(GlobalModelTestCase.java:333)
[junit] at edu.rice.cs.drjava.model.GlobalModelOtherTest.testInteractionAbort(GlobalModelOtherTest.java:150)
[junit]
[junit]
[junit] Testcase: testInteractionsCanSeeCompiledClasses(edu.rice.cs.drjava.model.GlobalModelOtherTest): FAILED
[junit] number of times interactionEnded fired expected:<1> but was:<2>
[junit] junit.framework.AssertionFailedError: number of times interactionEnded fired expected:<1> but was:<2>
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase$TestListener.assertInteractionEndCount(GlobalModelTestCase.java:687)
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase.interpret(GlobalModelTestCase.java:333)
[junit] at edu.rice.cs.drjava.model.GlobalModelOtherTest.testInteractionsCanSeeCompiledClasses(GlobalModelOtherTest.java:237)
[junit]
[junit]
[junit] Testcase: testInteractionsVariableWithLowercaseClassName(edu.rice.cs.drjava.model.GlobalModelOtherTest): FAILED
[junit] number of times interactionEnded fired expected:<1> but was:<2>
[junit] junit.framework.AssertionFailedError: number of times interactionEnded fired expected:<1> but was:<2>
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase$TestListener.assertInteractionEndCount(GlobalModelTestCase.java:687)
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase.interpret(GlobalModelTestCase.java:333)
[junit] at edu.rice.cs.drjava.model.GlobalModelOtherTest.testInteractionsVariableWithLowercaseClassName(GlobalModelOtherTest.java:278)
[junit]
[junit]
[junit] Testcase: testInteractionsCanSeeChangedClass(edu.rice.cs.drjava.model.GlobalModelOtherTest): FAILED
[junit] number of times interactionEnded fired expected:<1> but was:<2>
[junit] junit.framework.AssertionFailedError: number of times interactionEnded fired expected:<1> but was:<2>
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase$TestListener.assertInteractionEndCount(GlobalModelTestCase.java:687)
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase.interpret(GlobalModelTestCase.java:333)
[junit] at edu.rice.cs.drjava.model.GlobalModelOtherTest.testInteractionsCanSeeChangedClass(GlobalModelOtherTest.java:296)
[junit]
[junit]
[junit] Testcase: testInteractionsDefineAnonymousInnerClass(edu.rice.cs.drjava.model.GlobalModelOtherTest): FAILED
[junit] number of times interactionEnded fired expected:<1> but was:<2>
[junit] junit.framework.AssertionFailedError: number of times interactionEnded fired expected:<1> but was:<2>
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase$TestListener.assertInteractionEndCount(GlobalModelTestCase.java:687)
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase.interpret(GlobalModelTestCase.java:333)
[junit] at edu.rice.cs.drjava.model.GlobalModelOtherTest.testInteractionsDefineAnonymousInnerClass(GlobalModelOtherTest.java:315)
[junit]
[junit]
[junit] Testcase: testInteractionsLiveUpdateClassPath(edu.rice.cs.drjava.model.GlobalModelOtherTest): FAILED
[junit] number of times interactionEnded fired expected:<1> but was:<2>
[junit] junit.framework.AssertionFailedError: number of times interactionEnded fired expected:<1> but was:<2>
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase$TestListener.assertInteractionEndCount(GlobalModelTestCase.java:687)
[junit] at edu.rice.cs.drjava.model.GlobalModelTestCase.interpret(GlobalModelTestCase.java:333)
[junit] at edu.rice.cs.drjava.model.GlobalModelOtherTest.testInteractionsLiveUpdateClassPath(GlobalModelOtherTest.java:519)
[junit]
[junit]
[junit] Test edu.rice.cs.drjava.model.GlobalModelOtherTest FAILED
[junit] DebugContextTest 23.891 sec
[junit] Testsuite: edu.rice.cs.drjava.model.debug.jpda.DebugContextTest
[junit] Tests run: 8, Failures: 8, Errors: 0
[junit] Testcase: testDebugSourcepath(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testDebugSourcepath(DebugContextTest.java:73)
[junit]
[junit]
[junit] Testcase: testBreakpointsAndStepsInNonPublicClasses(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testBreakpointsAndStepsInNonPublicClasses(DebugContextTest.java:151)
[junit]
[junit]
[junit] Testcase: testStepIntoOverBreakpoint(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testStepIntoOverBreakpoint(DebugContextTest.java:253)
[junit]
[junit]
[junit] Testcase: testStaticFieldsConsistent(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testStaticFieldsConsistent(DebugContextTest.java:355)
[junit]
[junit]
[junit] Testcase: testNonStaticWatches(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testNonStaticWatches(DebugContextTest.java:448)
[junit]
[junit]
[junit] Testcase: testStaticWatches(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testStaticWatches(DebugContextTest.java:660)
[junit]
[junit]
[junit] Testcase: testWatchLocalVarsFromInnerClass(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testWatchLocalVarsFromInnerClass(DebugContextTest.java:724)
[junit]
[junit]
[junit] Testcase: testThreadShouldDie(edu.rice.cs.drjava.model.debug.jpda.DebugContextTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugContextTest.testThreadShouldDie(DebugContextTest.java:773)
[junit]
[junit]
[junit] Test edu.rice.cs.drjava.model.debug.jpda.DebugContextTest FAILED
[junit] DebugTest 23.629 sec
[junit] Testsuite: edu.rice.cs.drjava.model.debug.jpda.DebugTest
[junit] Tests run: 9, Failures: 8, Errors: 0
[junit] Testcase: testStartupAndShutdown(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testStartupAndShutdown(DebugTest.java:67)
[junit]
[junit]
[junit] Testcase: testMultiThreadedSetCurrentThread(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testMultiThreadedSetCurrentThread(DebugTest.java:179)
[junit]
[junit]
[junit] Testcase: testMultiThreadedBreakpointsAndStep(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testMultiThreadedBreakpointsAndStep(DebugTest.java:272)
[junit]
[junit]
[junit] Testcase: testBreakpoints(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testBreakpoints(DebugTest.java:356)
[junit]
[junit]
[junit] Testcase: testBreakpointsWithSameNamePrefix(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testBreakpointsWithSameNamePrefix(DebugTest.java:444)
[junit]
[junit]
[junit] Testcase: testStepInto(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testStepInto(DebugTest.java:504)
[junit]
[junit]
[junit] Testcase: testStepOut(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:291)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testStepOut(DebugTest.java:624)
[junit]
[junit]
[junit] Testcase: testStepOverWithPackage(edu.rice.cs.drjava.model.debug.jpda.DebugTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.debug.DebugTestCase._startupDebugger(DebugTestCase.java:308)
[junit] at edu.rice.cs.drjava.model.debug.jpda.DebugTest.testStepOverWithPackage(DebugTest.java:700)
[junit]
[junit]
[junit] Test edu.rice.cs.drjava.model.debug.jpda.DebugTest FAILED
[junit] JavaDebugInterpreterTest 13.896 sec
[junit] Testsuite: edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest
[junit] Tests run: 6, Failures: 3, Errors: 0
[junit] Testcase: testAccessFieldsAndMethodsOfOuterClasses(edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest.testAccessFieldsAndMethodsOfOuterClasses(JavaDebugInterpreterTest.java:251)
[junit]
[junit]
[junit] Testcase: testAccessStaticFieldsAndMethodsOfOuterClasses(edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest.testAccessStaticFieldsAndMethodsOfOuterClasses(JavaDebugInterpreterTest.java:341)
[junit]
[junit]
[junit] Testcase: testAccessNullFieldsAndFinalLocalVariables(edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.debug.jpda.JPDADebugger.startUp(JPDADebugger.java:196)
[junit] at edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest.testAccessNullFieldsAndFinalLocalVariables(JavaDebugInterpreterTest.java:431)
[junit]
[junit]
[junit] Test edu.rice.cs.drjava.model.repl.JavaDebugInterpreterTest FAILED
[junit] JavaInterpreterTest 1.517 sec
[junit] Testsuite: edu.rice.cs.drjava.model.repl.JavaInterpreterTest
[junit] Tests run: 23, Failures: 0, Errors: 1
[junit] Testcase: testAllowPrivateAccess(edu.rice.cs.drjava.model.repl.JavaInterpreterTest): Caused an ERROR
[junit] java.lang.IllegalAccessException: Class koala.dynamicjava.interpreter.EvaluationVisitor can not access a member of class A with modifiers "private"
[junit] edu.rice.cs.drjava.model.repl.ExceptionReturnedException: java.lang.IllegalAccessException: Class koala.dynamicjava.interpreter.EvaluationVisitor can not access a member of class A with modifiers "private"
[junit] at edu.rice.cs.drjava.model.repl.DynamicJavaAdapter.interpret(DynamicJavaAdapter.java:106)
[junit] at edu.rice.cs.drjava.model.repl.JavaInterpreterTest.testAllowPrivateAccess(JavaInterpreterTest.java:512)
[junit]
[junit]
[junit] Test edu.rice.cs.drjava.model.repl.JavaInterpreterTest FAILED
The following files were edited in the process of reverting back to the old interpreter:
A lib/dynamicjava.jar
M lib/readme.txt
D lib/dynamicjava-base-15.jar
M src/edu/rice/cs/drjava/DrJavaRoot.java
M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M src/edu/rice/cs/drjava/model/debug/jpda/DebugTest.java
M src/edu/rice/cs/drjava/model/debug/jpda/DebugContextTest.java
M src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
A src/edu/rice/cs/drjava/model/BrainClassLoader.java
A src/edu/rice/cs/drjava/model/repl/Interpreter.java
M src/edu/rice/cs/drjava/model/repl/JavaInterpreterTest.java
A src/edu/rice/cs/drjava/model/repl/JavaInterpreter.java
M src/edu/rice/cs/drjava/model/repl/SimpleInteractionsModel.java
A src/edu/rice/cs/drjava/model/repl/WrapperClassLoader.java
A src/edu/rice/cs/drjava/model/repl/DebugEvaluationVisitor.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModelCallback.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDocument.java
A src/edu/rice/cs/drjava/model/repl/IdentityVisitor.java
A src/edu/rice/cs/drjava/model/repl/JavaDebugInterpreter.java
A src/edu/rice/cs/drjava/model/repl/JavaDebugInterpreterTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDJDocument.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
A src/edu/rice/cs/drjava/model/repl/EvaluationVisitorExtension.java
A src/edu/rice/cs/drjava/model/repl/newjvm/SyntaxErrorResult.java
A src/edu/rice/cs/drjava/model/repl/newjvm/VoidResult.java
M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
M src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVMRemoteI.java
A src/edu/rice/cs/drjava/model/repl/newjvm/NewJVMTest.java
A src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterBusy.java
A src/edu/rice/cs/drjava/model/repl/newjvm/ValueResult.java
M src/edu/rice/cs/drjava/model/repl/newjvm/InterpretResult.java
A src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVMTest.java
M src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVMRemoteI.java
A src/edu/rice/cs/drjava/model/repl/newjvm/InterpretResultVisitor.java
A src/edu/rice/cs/drjava/model/repl/newjvm/ExceptionResult.java
A src/edu/rice/cs/drjava/model/repl/ExceptionReturnedException.java
A src/edu/rice/cs/drjava/model/repl/DynamicJavaAdapter.java
M src/edu/rice/cs/drjava/model/repl/RMIInteractionsModel.java
M src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/SimpleInteractionsWindow.java
A src/edu/rice/cs/util/classloader/StickyClassLoaderTest.java
A src/edu/rice/cs/util/classloader/StickyClassLoader.java