This commit was manufactured by cvs2svn to create tag 'v20021028a'.

Sprout from master 2002-10-29 03:12:22 UTC Darin Wright <darin> 'bug 25102'
Cherrypick from master 2002-10-28 22:26:31 UTC Darin Wright <darin> 'notes':
    org.eclipse.jdt.debug/buildnotes_jdt-debug.html
Delete:
    org.eclipse.jdt.debug.jdi.tests/.classpath
    org.eclipse.jdt.debug.jdi.tests/.cvsignore
    org.eclipse.jdt.debug.jdi.tests/.project
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java
    org.eclipse.jdt.debug.tests/.classpath
    org.eclipse.jdt.debug.tests/.cvsignore
    org.eclipse.jdt.debug.tests/.plugins-path
    org.eclipse.jdt.debug.tests/.project
    org.eclipse.jdt.debug.tests/about.html
    org.eclipse.jdt.debug.tests/build.properties
    org.eclipse.jdt.debug.tests/plugin.properties
    org.eclipse.jdt.debug.tests/plugin.xml
    org.eclipse.jdt.debug.tests/scripts/exportplugin.xml
    org.eclipse.jdt.debug.tests/scripts/exportplugins.xml
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java
    org.eclipse.jdt.debug.tests/test.xml
    org.eclipse.jdt.debug.tests/testjars/A.jar
    org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm
    org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
    org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
    org.eclipse.jdt.debug.tests/testprograms/CompileError.java
    org.eclipse.jdt.debug.tests/testprograms/DropTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
    org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
    org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
    org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
    org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
    org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
    org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
    org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
    org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
    org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
    org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
    org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
    org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
    org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
    org.eclipse.jdt.debug.tests/testprograms/TestIO.java
    org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
    org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
    org.eclipse.jdt.debug.tests/testresources/TestSource.jar
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
    org.eclipse.jdt.launching.macosx/.classpath
    org.eclipse.jdt.launching.macosx/.cvsignore
    org.eclipse.jdt.launching.macosx/.project
    org.eclipse.jdt.launching.macosx/about.html
    org.eclipse.jdt.launching.macosx/build.properties
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh
    org.eclipse.jdt.launching.macosx/plugin.properties
    org.eclipse.jdt.launching.macosx/plugin.xml
    org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
diff --git a/org.eclipse.jdt.debug.jdi.tests/.classpath b/org.eclipse.jdt.debug.jdi.tests/.classpath
deleted file mode 100644
index 3473818..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="tests"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.debug.jdi.tests/.cvsignore b/org.eclipse.jdt.debug.jdi.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.debug.jdi.tests/.project b/org.eclipse.jdt.debug.jdi.tests/.project
deleted file mode 100644
index 14978a5..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.debug.jdi.tests</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.jdt.debug</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
deleted file mode 100644
index 96ea1d6..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
+++ /dev/null
@@ -1,1426 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import org.eclipse.jdi.Bootstrap;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ArrayType;
-import com.sun.jdi.ClassLoaderReference;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.LocalVariable;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.Value;
-import com.sun.jdi.VirtualMachineManager;
-import com.sun.jdi.connect.AttachingConnector;
-import com.sun.jdi.connect.Connector;
-import com.sun.jdi.connect.IllegalConnectorArgumentsException;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.ExceptionRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for com.sun.jdi.* and JDWP commands.
- * These tests assume that the target program is 
- * "org.eclipse.debug.jdi.tests.program.MainClass".
- *
- * Examples of arguments:
- *   -launcher SunVMLauncher -address c:\jdk1.2.2\ -cp d:\target
- *   -launcher J9VMLauncher -address d:\ive\ -cp d:\target
- */
-public abstract class AbstractJDITest extends TestCase {
-	static int TIMEOUT = 10000; //ms
-	static protected int fBackEndPort = 9900;
-	// We want subsequent connections to use different ports.
-	protected String fVMLauncherName;
-	protected String fTargetAddress;
-	protected String fClassPath;
-	protected String fBootPath;
-	protected String fVMType;
-	protected com.sun.jdi.VirtualMachine fVM;
-	protected Process fLaunchedProxy;
-	protected Process fLaunchedVM;
-	protected int fVMTraceFlags = com.sun.jdi.VirtualMachine.TRACE_NONE;
-	protected EventReader fEventReader;
-	protected AbstractReader fConsoleReader;
-	protected AbstractReader fConsoleErrorReader;
-	protected AbstractReader fProxyReader;
-	protected AbstractReader fProxyErrorReader;
-	protected boolean fInControl = true;
-	// Whether this test should control the VM (ie. starting it and shutting it down)
-	protected boolean fVerbose;
-	protected String fStdoutFile;
-	protected String fStderrFile;
-	protected String fProxyoutFile;
-	protected String fProxyerrFile;
-	protected String fVmCmd;
-	protected String fProxyCmd;
-
-	// Stack offset to the MainClass.run() method
-	protected static final int RUN_FRAME_OFFSET = 1;
-
-	/**
-	 * Constructs a test case with a default name.
-	 */
-	public AbstractJDITest() {
-		super("JDI Test");
-	}
-	/**
-	 * Returns the names of the tests that are known to not work
-	 * By default, none are excluded.
-	 */
-	protected String[] excludedTests() {
-		return new String[] {
-		};
-	}
-	/**
-	 * Creates and returns an access watchpoint request
-	 * for the field "fBool" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 * NOTE: This assumes that the VM can watch field access.
-	 */
-	protected AccessWatchpointRequest getAccessWatchpointRequest() {
-		// Get the field
-		Field field = getField("fBool");
-
-		// Create an access watchpoint for this field
-		return fVM.eventRequestManager().createAccessWatchpointRequest(field);
-	}
-	/**
-	 * Returns all tests that start with the given string.
-	 * Returns a vector of String.
-	 */
-	protected Vector getAllMatchingTests(String match) {
-		Class theClass = this.getClass();
-		java.lang.reflect.Method[] methods = theClass.getDeclaredMethods();
-		Vector result = new Vector();
-		for (int i = 0; i < methods.length; i++) {
-			java.lang.reflect.Method m = methods[i];
-			String name = m.getName();
-			Class[] parameters = m.getParameterTypes();
-			if (parameters.length == 0 && name.startsWith(match)) {
-				if (!isExcludedTest(name)) {
-					result.add(name);
-				} else
-					System.out.println(name + " is excluded.");
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns an array reference.
-	 */
-	protected ArrayReference getObjectArrayReference() {
-		// Get static field "fArray"
-		Field field = getField("fArray");
-
-		// Get value of "fArray"
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	
-	/**
-	 * Returns another array reference.
-	 */
-	protected ArrayReference getNonEmptyDoubleArrayReference() {
-		// Get static field "fDoubleArray"
-		Field field = getField("fDoubleArray");
-
-		// Get value of "fDoubleArray"
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	
-	/**
-	 * One-dimensional empty array reference getters
-	 */
-	protected ArrayReference getByteArrayReference() {
-		Field field = getField("byteArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getShortArrayReference() {
-		Field field = getField("shortArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getIntArrayReference() {
-		Field field = getField("intArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getLongArrayReference() {
-		Field field = getField("longArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getDoubleArrayReference() {
-		Field field = getField("doubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getFloatArrayReference() {
-		Field field = getField("floatArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getCharArrayReference() {
-		Field field = getField("charArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getBooleanArrayReference() {
-		Field field = getField("booleanArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	/**
-	 * Two-dimensional array reference getters
-	 */
-	protected ArrayReference getByteDoubleArrayReference() {
-		Field field = getField("byteDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getShortDoubleArrayReference() {
-		Field field = getField("shortDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getIntDoubleArrayReference() {
-		Field field = getField("intDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getLongDoubleArrayReference() {
-		Field field = getField("longDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getFloatDoubleArrayReference() {
-		Field field = getField("floatDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getDoubleDoubleArrayReference() {
-		Field field = getField("doubleDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getCharDoubleArrayReference() {
-		Field field = getField("charDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getBooleanDoubleArrayReference() {
-		Field field = getField("booleanDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	
-	/**
-	 * Returns the array type.
-	 */
-	protected ArrayType getArrayType() {
-		// Get array reference
-		ArrayReference value = getObjectArrayReference();
-
-		// Get reference type of "fArray"
-		return (ArrayType) value.referenceType();
-	}
-	/**
-	 * One-dimensional primitive array getters
-	 */
-	protected ArrayType getByteArrayType() {
-		ArrayReference value = getByteArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getShortArrayType() {
-		ArrayReference value = getShortArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getIntArrayType() {
-		ArrayReference value = getIntArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getLongArrayType() {
-		ArrayReference value = getLongArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getFloatArrayType() {
-		ArrayReference value = getFloatArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getDoubleArrayType() {
-		ArrayReference value = getDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getCharArrayType() {
-		ArrayReference value = getCharArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getBooleanArrayType() {
-		ArrayReference value = getBooleanArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	/**
-	 * Two-dimensional primitive array getters
-	 */
-	protected ArrayType getByteDoubleArrayType() {
-		ArrayReference value = getByteDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getShortDoubleArrayType() {
-		ArrayReference value = getShortDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getIntDoubleArrayType() {
-		ArrayReference value = getIntDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getLongDoubleArrayType() {
-		ArrayReference value = getLongDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getFloatDoubleArrayType() {
-		ArrayReference value = getFloatDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getDoubleDoubleArrayType() {
-		ArrayReference value = getDoubleDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getCharDoubleArrayType() {
-		ArrayReference value = getCharDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getBooleanDoubleArrayType() {
-		ArrayReference value = getBooleanDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	
-	/**
-	 * Creates and returns a breakpoint request in the first 
-	 * instruction of the MainClass.triggerBreakpointEvent() method.
-	 */
-	protected BreakpointRequest getBreakpointRequest() {
-		// Create a breakpoint request
-		return fVM.eventRequestManager().createBreakpointRequest(getLocation());
-	}
-	/**
-	 * Returns the class with the given name or null if not loaded.
-	 */
-	protected ClassType getClass(String name) {
-		List classes = fVM.classesByName(name);
-		if (classes.size() == 0)
-			return null;
-		else
-			return (ClassType) classes.get(0);
-	}
-	/**
-	 * Returns the class loader of
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected ClassLoaderReference getClassLoaderReference() {
-		// Get main class
-		ClassType type = getMainClass();
-
-		// Get its class loader
-		return type.classLoader();
-	}
-	/**
-	 * Creates and returns an exception request for uncaught exceptions.
-	 */
-	protected ExceptionRequest getExceptionRequest() {
-		return fVM.eventRequestManager().createExceptionRequest(null, false, true);
-	}
-	/**
-	 * Returns the static field "fObject" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected Field getField() {
-		return getField("fObject");
-	}
-	/**
-	 * Returns the field with the given name in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass.
-	 */
-	protected Field getField(String fieldName) {
-		// Get main class
-		ClassType type = getMainClass();
-
-		// Get field 
-		Field result = type.fieldByName(fieldName);
-		if (result == null)
-			throw new Error("Unknown field: " + fieldName);
-		else
-			return result;
-	}
-	/**
-	 * Returns the n frame (starting at the top of the stack) of the thread 
-	 * contained in the static field "fThread" of org.eclipse.debug.jdi.tests.program.MainClass.
-	 */
-	protected StackFrame getFrame(int n) {
-		// Make sure the thread is suspended
-		ThreadReference thread = getThread();
-		assertTrue(thread.isSuspended());
-
-		// Get the frame
-		StackFrame frame = null;
-		try {
-			List frames = thread.frames();
-			frame = (StackFrame) frames.get(n);
-		} catch (IncompatibleThreadStateException e) {
-			throw new Error("Thread was not suspended");
-		}
-
-		return frame;
-	}
-	/**
-	 * Returns the interface type org.eclipse.debug.jdi.tests.program.Printable.
-	 */
-	protected InterfaceType getInterfaceType() {
-		List types = fVM.classesByName("org.eclipse.debug.jdi.tests.program.Printable");
-		return (InterfaceType) types.get(0);
-	}
-	/**
-	 * Returns the variable "t" in the frame running MainClass.run().
-	 */
-	protected LocalVariable getLocalVariable() {
-		try {
-			return getFrame(RUN_FRAME_OFFSET).visibleVariableByName("t");
-		} catch (AbsentInformationException e) {
-			return null;
-		}
-	}
-	/**
-	 * Returns the firt location in MainClass.print(OutputStream).
-	 */
-	protected Location getLocation() {
-		return getMethod().location();
-	}
-	/**
-	 * Returns the class org.eclipse.debug.jdi.tests.program.MainClass.
-	 */
-	protected ClassType getMainClass() {
-		return getClass("org.eclipse.debug.jdi.tests.program.MainClass");
-	}
-	/**
-	 * Returns the method "print(Ljava/io/OutputStream;)V" 
-	 * in org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected Method getMethod() {
-		return getMethod("print", "(Ljava/io/OutputStream;)V");
-	}
-	/**
-	 * Returns the method with the given name and signature
-	 * in org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected Method getMethod(String name, String signature) {
-		return getMethod(
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			name,
-			signature);
-	}
-	/**
-	 * Returns the method with the given name and signature
-	 * in the given class.
-	 */
-	protected Method getMethod(String className, String name, String signature) {
-		// Get main class
-		ClassType type = getClass(className);
-
-		// Get method print(OutputStream)
-		Method method = null;
-		List methods = type.methods();
-		ListIterator iterator = methods.listIterator();
-		while (iterator.hasNext()) {
-			Method m = (Method) iterator.next();
-			if ((m.name().equals(name)) && (m.signature().equals(signature))) {
-				method = m;
-				break;
-			}
-		}
-		if (method == null)
-			throw new Error("Unknown method: " + name + signature);
-		else
-			return method;
-	}
-	/**
-	 * Creates and returns a modification watchpoint request
-	 * for the field "fBool" in
-	 * org.eclipse.debug.jdi.tests.program.MainClass.
-	 * NOTE: This assumes that the VM can watch field modification.
-	 */
-	protected ModificationWatchpointRequest getModificationWatchpointRequest() {
-		// Get the field
-		Field field = getField("fBool");
-
-		// Create a modification watchpoint for this field
-		return fVM.eventRequestManager().createModificationWatchpointRequest(field);
-	}
-	/**
-	 * Returns the value of the static field "fObject" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected ObjectReference getObjectReference() {
-		// Get main class
-		ClassType type = getMainClass();
-
-		// Get field "fObject"
-		Field field = getField();
-
-		// Get value of "fObject"
-		return (ObjectReference) type.getValue(field);
-	}
-	/**
-	 * Creates and returns an access watchpoint request
-	 * for the static field "fString" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 * NOTE: This assumes that the VM can watch field access.
-	 */
-	protected AccessWatchpointRequest getStaticAccessWatchpointRequest() {
-		// Get the static field
-		Field field = getField("fString");
-
-		// Create an access watchpoint for this field
-		return fVM.eventRequestManager().createAccessWatchpointRequest(field);
-	}
-	/**
-	 * Creates and returns a modification watchpoint request
-	 * for the static field "fString" in
-	 * org.eclipse.debug.jdi.tests.program.MainClass.
-	 * NOTE: This assumes that the VM can watch field modification.
-	 */
-	protected ModificationWatchpointRequest getStaticModificationWatchpointRequest() {
-		// Get the field
-		Field field = getField("fString");
-
-		// Create a modification watchpoint for this field
-		return fVM.eventRequestManager().createModificationWatchpointRequest(field);
-	}
-	/**
-	 * Returns the value of the static field "fString" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected StringReference getStringReference() {
-		// Get field "fString"
-		Field field = getField("fString");
-
-		// Get value of "fString"
-		return (StringReference) getMainClass().getValue(field);
-	}
-	/**
-	 * Returns the class java.lang.Object.
-	 */
-	protected ClassType getSystemType() {
-		List classes = fVM.classesByName("java.lang.Object");
-		if (classes.size() == 0)
-			return null;
-		else
-			return (ClassType) classes.get(0);
-	}
-	/**
-	 * Returns the thread contained in the static field "fThread" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected ThreadReference getThread() {
-		return getThread("fThread");
-	}
-
-	protected ThreadReference getMainThread() {
-		return getThread("fMainThread");
-	}
-
-	private ThreadReference getThread(String fieldName) {
-		ClassType type = getMainClass();
-		if (type == null)
-			return null;
-
-		// Get static field "fThread"
-		List fields = type.fields();
-		ListIterator iterator = fields.listIterator();
-		Field field = null;
-		while (iterator.hasNext()) {
-			field = (Field) iterator.next();
-			if (field.name().equals(fieldName))
-				break;
-		}
-
-		// Get value of "fThread"
-		Value value = type.getValue(field);
-		if (value == null)
-			return null;
-		else
-			return (ThreadReference) value;
-	}
-	/**
-	 * Returns the VM info for this test.
-	 */
-	VMInformation getVMInfo() {
-		return new VMInformation(
-			fVM,
-			fVMType,
-			fLaunchedVM,
-			fEventReader,
-			fConsoleReader);
-	}
-	/**
-	 * Returns whether the given test is excluded for the VM we are testing.
-	 */
-	private boolean isExcludedTest(String testName) {
-		String[] excludedTests = excludedTests();
-		if (excludedTests == null)
-			return false;
-		for (int i = 0; i < excludedTests.length; i++)
-			if (testName.equals(excludedTests[i]))
-				return true;
-		return false;
-	}
-
-	/**
-	 * Launches the target VM and connects to VM.
-	 */
-	protected void launchTargetAndConnectToVM() {
-		launchTarget();
-		connectToVM();
-	}
-
-	protected boolean vmIsRunning() {
-		boolean isRunning = false;
-		try {
-			if (fLaunchedVM != null)
-				fLaunchedVM.exitValue();
-		} catch (IllegalThreadStateException e) {
-			isRunning = true;
-		}
-		return isRunning;
-	}
-
-	protected void launchTarget() {
-		if (fVmCmd != null)
-			launchCommandLineTarget();
-		else if (fVMLauncherName.equals("SunVMLauncher"))
-			launchSunTarget();
-		else if (fVMLauncherName.equals("IBMVMLauncher"))
-			launchIBMTarget();
-		else
-			launchJ9Target();
-	}
-
-	/**
-	 * Launches the target VM specified on the command line.
-	 */
-	private void launchCommandLineTarget() {
-		try {
-			if (fProxyCmd != null) {
-				fLaunchedProxy = Runtime.getRuntime().exec(fProxyCmd);
-			}
-			fLaunchedVM = Runtime.getRuntime().exec(fVmCmd);
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Launches the target J9 VM.
-	 */
-	private void launchJ9Target() {
-		try {
-			// Launch proxy
-			String proxyString[] = new String[3];
-			int index = 0;
-			String binDirectory =
-				fTargetAddress
-					+ System.getProperty("file.separator")
-					+ "bin"
-					+ System.getProperty("file.separator");
-			proxyString[index++] = binDirectory + "j9proxy";
-			proxyString[index++] = "localhost:" + (fBackEndPort - 1);
-			proxyString[index++] = "" + fBackEndPort;
-			fLaunchedProxy = Runtime.getRuntime().exec(proxyString);
-
-			// Launch target VM
-			String[] vmString;
-			if (fBootPath.length() > 0)
-				vmString = new String[5];
-			else
-				vmString = new String[4];
-
-			index = 0;
-			vmString[index++] = binDirectory + "j9w";
-			File vm= new File(vmString[index - 1] + ".exe");
-			if (!vm.exists()) {
-				vmString[index - 1] = binDirectory + "j9";
-			}
-			if (fBootPath.length() > 0)
-				vmString[index++] = "-bp:" + fBootPath;
-			vmString[index++] = "-cp:" + fClassPath;
-			vmString[index++] = "-debug:" + (fBackEndPort - 1);
-			vmString[index++] = "org.eclipse.debug.jdi.tests.program.MainClass";
-			fLaunchedVM = Runtime.getRuntime().exec(vmString);
-
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Launches the target Sun VM.
-	 */
-	private void launchSunTarget() {
-		try {
-			// Launch target VM
-			StringBuffer binDirectory= new StringBuffer();
-			if (fTargetAddress.endsWith("jre")) {
-				binDirectory.append(fTargetAddress.substring(0, fTargetAddress.length() - 4));
-			} else {
-				binDirectory.append(fTargetAddress);
-			}
-			binDirectory.append(System.getProperty("file.separator"));
-			binDirectory.append("bin").append(System.getProperty("file.separator"));
-			String[] vmString;
-			if (fBootPath.length() > 0)
-				vmString = new String[10];
-			else
-				vmString = new String[8];
-
-			int index = 0;
-			vmString[index++] = binDirectory.toString() + "javaw";
-			File vm= new File(vmString[index - 1] + ".exe");
-			if (!vm.exists()) {
-				vmString[index - 1] = binDirectory + "java";
-			}
-			if (fBootPath.length() > 0) {
-				vmString[index++] = "-bootpath";
-				vmString[index++] = fBootPath;
-			}
-			vmString[index++] = "-classpath";
-			vmString[index++] = fClassPath;
-			vmString[index++] = "-Xdebug";
-			vmString[index++] = "-Xnoagent";
-			vmString[index++] = "-Djava.compiler=NONE";
-			vmString[index++] =
-				"-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y";
-			vmString[index++] = "org.eclipse.debug.jdi.tests.program.MainClass";
-			fLaunchedVM = Runtime.getRuntime().exec(vmString);
-
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-	/**
-	 * Launches the target IBM VM.
-	 */
-	private void launchIBMTarget() {
-		try {
-			// Launch target VM
-			String binDirectory =
-				fTargetAddress
-					+ System.getProperty("file.separator")
-					+ "bin"
-					+ System.getProperty("file.separator");
-			String[] vmString;
-			if (fBootPath.length() > 0)
-				vmString = new String[10];
-			else
-				vmString = new String[8];
-
-			int index = 0;
-			vmString[index++] = binDirectory + "javaw";
-			if (fBootPath.length() > 0) {
-				vmString[index++] = "-bootpath";
-				vmString[index++] = fBootPath;
-			}
-			vmString[index++] = "-classpath";
-			vmString[index++] = fClassPath;
-			vmString[index++] = "-Xdebug";
-			vmString[index++] = "-Xnoagent";
-			vmString[index++] = "-Djava.compiler=NONE";
-			vmString[index++] =
-				"-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y";
-			vmString[index++] = "org.eclipse.debug.jdi.tests.program.MainClass";
-			fLaunchedVM = Runtime.getRuntime().exec(vmString);
-
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Conects to the target vm.
-	 */
-	protected void connectToVM() {
-		// Start the console reader if possible so that the VM doesn't block when the stdout is full
-		startConsoleReaders();
-
-		// Contact the VM (try 10 times)
-		for (int i = 0; i < 10; i++) {
-			try {
-				VirtualMachineManager manager = Bootstrap.virtualMachineManager();
-				List connectors = manager.attachingConnectors();
-				if (connectors.size() == 0)
-					break;
-				AttachingConnector connector = (AttachingConnector) connectors.get(0);
-				Map args = connector.defaultArguments();
-				((Connector.Argument) args.get("port")).setValue(String.valueOf(fBackEndPort));
-				((Connector.Argument) args.get("hostname")).setValue("localhost");
-
-				fVM = connector.attach(args);
-				if (fVMTraceFlags != com.sun.jdi.VirtualMachine.TRACE_NONE)
-					fVM.setDebugTraceMode(fVMTraceFlags);
-				break;
-			} catch (IllegalConnectorArgumentsException e) {
-			} catch (IOException e) {
-				System.out.println("Got exception: " + e.getMessage());
-				try {
-					System.out.println(
-						"Could not contact the VM at localhost" + ":" + fBackEndPort + ". Retrying...");
-					Thread.sleep(200);
-				} catch (InterruptedException e2) {
-				}
-			}
-		}
-		if (fVM == null) {
-			if (fLaunchedVM != null) {
-				// If the VM is not running, output error stream
-				try {
-					if (!vmIsRunning()) {
-						InputStream in = fLaunchedVM.getErrorStream();
-						int read;
-						do {
-							read = in.read();
-							if (read != -1)
-								System.out.print((char) read);
-						} while (read != -1);
-					}
-				} catch (IOException e) {
-				}
-
-				// Shut it down
-				killVM();
-			}
-			throw new Error("Could not contact the VM");
-		}
-		startEventReader();
-	}
-	/**
-	 * Initializes the fields that are used by this test only.
-	 */
-	public abstract void localSetUp();
-	/**
-	 * Makes sure the test leaves the VM in the same state it found it.
-	 * Default is to do nothing.
-	 */
-	public void localTearDown() {
-	}
-	/**
-	 * Parses the given arguments and store them in this tests
-	 * fields.
-	 * Returns whether the parsing was successfull.
-	 */
-	protected boolean parseArgs(String[] args) {
-		// Default values
-		String vmVendor = System.getProperty("java.vm.vendor");
-		String vmVersion = System.getProperty("java.vm.version");
-		String targetAddress = System.getProperty("java.home");
-		String vmLauncherName;
-		if (vmVendor != null
-			&& vmVendor.equals("Sun Microsystems Inc.")
-			&& vmVersion != null) {
-			vmLauncherName = "SunVMLauncher";
-		} else if (
-			vmVendor != null && vmVendor.equals("IBM Corporation") && vmVersion != null) {
-			vmLauncherName = "IBMVMLauncher";
-		} else {
-			vmLauncherName = "J9VMLauncher";
-		}
-		String classPath = System.getProperty("java.class.path");
-		String bootPath = "";
-		String vmType = "?";
-		boolean verbose = false;
-
-		// Parse arguments
-		for (int i = 0; i < args.length; ++i) {
-			String arg = args[i];
-			if (arg.startsWith("-")) {
-				if (arg.equals("-verbose") || arg.equals("-v")) {
-					verbose = true;
-				} else {
-					String next = (i < args.length - 1) ? args[++i] : null;
-					// If specified, passed values overide default values
-					if (arg.equals("-launcher")) {
-						vmLauncherName = next;
-					} else if (arg.equals("-address")) {
-						targetAddress = next;
-					} else if (arg.equals("-port")) {
-						fBackEndPort = Integer.parseInt(next);
-					} else if (arg.equals("-cp")) {
-						classPath = next;
-					} else if (arg.equals("-bp")) {
-						bootPath = next;
-					} else if (arg.equals("-vmtype")) {
-						vmType = next;
-					} else if (arg.equals("-stdout")) {
-						fStdoutFile = next;
-					} else if (arg.equals("-stderr")) {
-						fStderrFile = next;
-					} else if (arg.equals("-proxyout")) {
-						fProxyoutFile = next;
-					} else if (arg.equals("-proxyerr")) {
-						fProxyerrFile = next;
-					} else if (arg.equals("-vmcmd")) {
-						fVmCmd = next;
-					} else if (arg.equals("-proxycmd")) {
-						fProxyCmd = next;
-					} else if (arg.equals("-trace")) {
-						if (next.equals("all")) {
-							fVMTraceFlags = com.sun.jdi.VirtualMachine.TRACE_ALL;
-						} else {
-							fVMTraceFlags = Integer.decode(next).intValue();
-						}
-					} else {
-						System.out.println("Invalid option: " + arg);
-						printUsage();
-						return false;
-					}
-				}
-			}
-		}
-		fVMLauncherName = vmLauncherName;
-		fTargetAddress = targetAddress;
-		fClassPath = classPath;
-		fBootPath = bootPath;
-		fVMType = vmType;
-		fVerbose = verbose;
-		return true;
-	}
-	/**
-	 * Prints the various options to pass to the constructor.
-	 */
-	protected void printUsage() {
-		System.out.println("Possible options:");
-		System.out.println("-launcher <Name of the launcher class>");
-		System.out.println("-address <Address of the target VM>");
-		System.out.println("-port <Debug port number>");
-		System.out.println("-cp <Path to the test program>");
-		System.out.println("-bp <Boot classpath for the system class library>");
-		System.out.println("-vmtype <The type of VM: JDK, J9, ...>");
-		System.out.println("-verbose | -v");
-		System.out.println("-stdout <file where VM output is written to>");
-		System.out.println("-stderr <file where VM error output is written to>");
-		System.out.println("-proxyout <file where proxy output is written to>");
-		System.out.println("-proxyerr <file where proxy error output is written to>");
-		System.out.println("-vmcmd <exec string to start VM>");
-		System.out.println("-proxycmd <exec string to start proxy>");
-	}
-	/**
-	 * Set the value of the "fBool" field back to its original value
-	 */
-	protected void resetField() {
-		Field field = getField("fBool");
-		Value value = null;
-		value = fVM.mirrorOf(false);
-		try {
-			getObjectReference().setValue(field, value);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("resetField.2", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("resetField.3", false);
-		}
-	}
-	/**
-	 * Set the value of the "fString" field back to its original value
-	 */
-	protected void resetStaticField() {
-		Field field = getField("fString");
-		Value value = null;
-		value = fVM.mirrorOf("Hello World");
-		try {
-			getMainClass().setValue(field, value);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("resetField.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("resetField.2", false);
-		}
-	}
-	/**
-	 * Runs this test's suite with the given arguments.
-	 */
-	protected void runSuite(String[] args) {
-		// Check args
-		if (!parseArgs(args))
-			return;
-
-		// Run test
-		System.out.println(new java.util.Date());
-		System.out.println("Begin testing " + getName() + "...");
-		junit.textui.TestRunner.run(suite());
-		System.out.println("Done testing " + getName() + ".");
-	}
-	/**
-	 * Sets the 'in control of the VM' flag for this test.
-	 */
-	void setInControl(boolean inControl) {
-		fInControl = inControl;
-	}
-	/**
-	 * Launch target VM and start program in target VM.
-	 */
-	protected void launchTargetAndStartProgram() {
-		launchTargetAndConnectToVM();
-		startProgram();
-	}
-	/**
-	 * Init tests
-	 */
-	protected void setUp() {
-		if (fVM == null && fInControl) {
-			launchTargetAndStartProgram();
-		}
-		try {
-			verbose("Setting up the test");
-			localSetUp();
-		} catch (RuntimeException e) {
-			System.out.println("Runtime exception during set up:");
-			e.printStackTrace();
-		} catch (Error e) {
-			System.out.println("Error during set up:");
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * Sets the VM info for this test.
-	 */
-	void setVMInfo(VMInformation info) {
-		if (info != null) {
-			fVM = info.fVM;
-			fLaunchedVM = info.fLaunchedVM;
-			fEventReader = info.fEventReader;
-			fConsoleReader = info.fConsoleReader;
-		}
-	}
-	/**
-	 * Stop console and event readers.
-	 */
-	protected void stopReaders() {
-		stopEventReader();
-		stopConsoleReaders();
-	}
-	/**
-	 * Shut down the target.
-	 */
-	protected void shutDownTarget() {
-		stopReaders();
-		if (fVM != null) {
-			try {
-				fVM.exit(0);
-			} catch (VMDisconnectedException e) {
-			}
-		}
-
-		fVM = null;
-		fLaunchedVM = null;
-
-		// We want subsequent connections to use different ports, unless a
-		// VM exec sting is given.
-		if (fVmCmd == null)
-			fBackEndPort += 2;
-	}
-	/**
-	 * Starts the threads that reads from the VM and proxy input and error streams
-	 */
-	private void startConsoleReaders() {
-		if (fStdoutFile != null) {
-			fConsoleReader =
-				new FileConsoleReader(
-					"JDI Tests Console Reader",
-					fStdoutFile,
-					fLaunchedVM.getInputStream());
-		} else {
-			fConsoleReader =
-				new NullConsoleReader("JDI Tests Console Reader", fLaunchedVM.getInputStream());
-		}
-		fConsoleReader.start();
-
-		if (fStderrFile != null) {
-			fConsoleErrorReader =
-				new FileConsoleReader(
-					"JDI Tests Console Error Reader",
-					fStderrFile,
-					fLaunchedVM.getErrorStream());
-		} else {
-			fConsoleErrorReader =
-				new NullConsoleReader(
-					"JDI Tests Console Error Reader",
-					fLaunchedVM.getErrorStream());
-		}
-		fConsoleErrorReader.start();
-
-		if (fLaunchedProxy == null)
-			return;
-
-		if (fProxyoutFile != null) {
-			fProxyReader =
-				new FileConsoleReader(
-					"JDI Tests Proxy Reader",
-					fProxyoutFile,
-					fLaunchedProxy.getInputStream());
-		} else {
-			fProxyReader =
-				new NullConsoleReader(
-					"JDI Tests Proxy Reader",
-					fLaunchedProxy.getInputStream());
-		}
-		fProxyReader.start();
-
-		if (fProxyerrFile != null) {
-			fProxyErrorReader =
-				new FileConsoleReader(
-					"JDI Tests Proxy Error Reader",
-					fProxyerrFile,
-					fLaunchedProxy.getErrorStream());
-		} else {
-			fProxyErrorReader =
-				new NullConsoleReader(
-					"JDI Tests Proxy Error Reader",
-					fLaunchedProxy.getErrorStream());
-		}
-		fProxyErrorReader.start();
-	}
-	/**
-	 * Stops the console reader.
-	 */
-	private void stopConsoleReaders() {
-		if (fConsoleReader != null)
-			fConsoleReader.stop();
-		if (fConsoleErrorReader != null)
-			fConsoleErrorReader.stop();
-		if (fProxyReader != null)
-			fProxyReader.stop();
-		if (fProxyErrorReader != null)
-			fProxyErrorReader.stop();
-	}
-	/**
-	 * Starts event reader.
-	 */
-	private void startEventReader() {
-		// Create the VM event reader.
-		fEventReader = new EventReader("JDI Tests Event Reader", fVM.eventQueue());
-	}
-	/**
-	 * Stops the event reader.
-	 */
-	private void stopEventReader() {
-		fEventReader.stop();
-	}
-	protected void killVM() {
-		if (fLaunchedVM != null)
-			fLaunchedVM.destroy();
-		if (fLaunchedProxy != null)
-			fLaunchedProxy.destroy();
-	}
-	/**
-	 * Starts the target program.
-	 */
-	protected void startProgram() {
-		verbose("Starting target program");
-
-		// Request class prepare events
-		EventRequest classPrepareRequest =
-			fVM.eventRequestManager().createClassPrepareRequest();
-		classPrepareRequest.enable();
-
-		// Prepare to receive the token class prepare event
-		ClassPrepareEventWaiter waiter =
-			new ClassPrepareEventWaiter(
-				classPrepareRequest,
-				true,
-				"org.eclipse.debug.jdi.tests.program.MainClass");
-		fEventReader.addEventListener(waiter);
-
-		// Start the event reader (this will start the VM when the VMStartEvent is picked up)
-		fEventReader.start();
-
-		// Wait until the program has started
-		Event event = (ClassPrepareEvent) waitForEvent(waiter, 3 * TIMEOUT);
-		fEventReader.removeEventListener(waiter);
-		if (event == null) {
-			try {
-				System.out.println(
-					"\nThe program doesn't seem to have started after " + (3 * TIMEOUT) + "ms");
-				InputStream errorStream = fLaunchedVM.getErrorStream();
-				int read;
-				do {
-					read = errorStream.read();
-					if (read != -1)
-						System.out.print((char) read);
-				} while (read != -1);
-			} catch (IOException e) {
-			}
-		}
-
-		// Stop class prepare events
-		fVM.eventRequestManager().deleteEventRequest(classPrepareRequest);
-
-		// Wait for the program to be ready to be tested
-		waitUntilReady();
-	}
-	/**
-	 * Returns all tests 
-	 */
-	protected Test suite() {
-		JDITestSuite suite = new JDITestSuite(this);
-		Vector testNames = getAllMatchingTests("testJDI");
-		Iterator iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-		return suite;
-	}
-	/**
-	 * Undo the initialization of the test.
-	 */
-	protected void tearDown() {
-		try {
-			super.tearDown();
-		} catch (Exception e) {
-			System.out.println("Exception during tear down:");
-			e.printStackTrace();
-		}
-		try {
-			verbose("Tearing down the test");
-			localTearDown();
-
-			// Ensure that the test didn't leave a modification watchpoint that could change the expected state of the program
-			if (fVM != null) {
-				assertTrue(fVM.eventRequestManager().modificationWatchpointRequests().size() == 0);
-				if (fInControl) {
-					shutDownTarget();
-				}
-			}
-
-		} catch (RuntimeException e) {
-			System.out.println("Runtime exception during tear down:");
-			e.printStackTrace();
-		} catch (Error e) {
-			System.out.println("Error during tear down:");
-			e.printStackTrace();
-		}
-
-	}
-	/**
-	 * Triggers and waits for the given event to come in.
-	 * Let the thread go if asked.
-	 * Throws an Error if the event didn't come in after TIMEOUT ms
-	 */
-	protected Event triggerAndWait(
-		EventRequest request,
-		String eventType,
-		boolean shouldGo) {
-		Event event = triggerAndWait(request, eventType, shouldGo, TIMEOUT);
-		if (event == null)
-			throw new Error(
-				"Event for " + request + " didn't come in after " + TIMEOUT + "ms");
-		else
-			return event;
-	}
-	/**
-	 * Triggers and waits for the given event to come in.
-	 * Let the thread go if asked.
-	 * Returns null if the event didn't come in after the given amount of time (in ms)
-	 */
-	protected Event triggerAndWait(
-		EventRequest request,
-		String eventType,
-		boolean shouldGo,
-		long time) {
-		// Suspend only if asked
-		if (shouldGo)
-			request.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		else
-			request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-
-		// Enable request
-		request.enable();
-
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(request, shouldGo);
-		fEventReader.addEventListener(waiter);
-
-		// Trigger the event
-		triggerEvent(eventType);
-
-		// Wait for the event to come in
-		Event event = waitForEvent(waiter, TIMEOUT);
-		fEventReader.removeEventListener(waiter);
-
-		if (shouldGo) {
-			// Wait for the program to be ready
-			waitUntilReady();
-		}
-
-		// Clear request
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		return event;
-	}
-	/**
-	 * Triggers the given type of event. See the MainClass for details on types of event.
-	 */
-	protected void triggerEvent(String eventType) {
-		// Set the "fEventType" field to the given eventType
-		ClassType type = getMainClass();
-		Field field = type.fieldByName("fEventType");
-		assertTrue("1", field != null);
-
-		Value value = null;
-		value = fVM.mirrorOf(eventType);
-		try {
-			type.setValue(field, value);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("3", false);
-		}
-
-		// Resume the test thread
-		ThreadReference thread = getThread();
-		int suspendCount = thread.suspendCount();
-		for (int i = 0; i < suspendCount; i++)
-			thread.resume();
-	}
-	/**
-	 * Triggers a step event and waits for it to come in.
-	 */
-	protected StepEvent triggerStepAndWait() {
-		return triggerStepAndWait(
-			getThread(),
-			StepRequest.STEP_MIN,
-			StepRequest.STEP_OVER);
-	}
-
-	protected StepEvent triggerStepAndWait(
-		ThreadReference thread,
-		int gran,
-		int depth) {
-		// Request for step events
-		EventRequest eventRequest =
-			fVM.eventRequestManager().createStepRequest(thread, gran, depth);
-		eventRequest.addCountFilter(1);
-		eventRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		eventRequest.enable();
-
-		return triggerStepAndWait(thread, eventRequest, TIMEOUT);
-	}
-
-	protected StepEvent triggerStepAndWait(
-		ThreadReference thread,
-		EventRequest eventRequest,
-		int timeout) {
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(eventRequest, true);
-		fEventReader.addEventListener(waiter);
-
-		// Trigger step event
-		int suspendCount = thread.suspendCount();
-		for (int i = 0; i < suspendCount; i++)
-			thread.resume();
-
-		// Wait for the event to come in
-		StepEvent event = (StepEvent) waitForEvent(waiter, timeout);
-		fEventReader.removeEventListener(waiter);
-		if (event == null)
-			throw new Error("StepEvent didn't come in after " + timeout + "ms");
-
-		// Stop getting step events
-		fVM.eventRequestManager().deleteEventRequest(eventRequest);
-
-		// Wait for the program to be ready
-		waitUntilReady();
-
-		return event;
-	}
-	/**
-	 * Output verbose string if asked for.
-	 */
-	protected void verbose(String verboseString) {
-		if (fVerbose)
-			System.out.println(verboseString);
-	}
-	/**
-	 * Waits for an event to come in using the given waiter.
-	 * Waits for the given time. If it times out, returns null.
-	 */
-	protected Event waitForEvent(EventWaiter waiter, long time) {
-		Event event;
-		try {
-			event = waiter.waitEvent(time);
-		} catch (InterruptedException e) {
-			event = null;
-		}
-		return event;
-	}
-	/**
-	 * Waits until the program is ready to be tested.
-	 * The default behaviour is to wait until the "Test Thread" throws and catches
-	 * an exception.
-	 */
-	protected void waitUntilReady() {
-		// Make sure the program is running
-		ThreadReference thread = getThread();
-		while (thread == null || thread.suspendCount() > 0) {
-			fVM.resume();
-			thread = getThread();
-		}
-
-		// Create exception request
-		EventRequest request =
-			fVM.eventRequestManager().createExceptionRequest(null, true, false);
-		request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		request.enable();
-
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(request, false);
-		fEventReader.addEventListener(waiter);
-
-		while (true) {
-			// Wait for the event to come in
-			ExceptionEvent event = (ExceptionEvent) waitForEvent(waiter, TIMEOUT);
-
-			// Throw error if event is null
-			if (event == null)
-				throw new Error("Target program was not ready after " + TIMEOUT + "ms");
-
-			// Get the method where the exception was thrown
-			Method meth = event.location().method();
-			if (meth == null || !meth.name().equals("printAndSignal"))
-				fVM.resume();
-			else
-				break;
-		}
-
-		// Disable request
-		fEventReader.removeEventListener(waiter);
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
deleted file mode 100644
index 8142e5b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java
deleted file mode 100644
index 6d9b638..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.Accessible;
-
-/**
- * Tests for JDI com.sun.jdi.Accessible.
- */
-public class AccessibleTest extends AbstractJDITest {
-
-	private Accessible fArrayType, fClassType, fInterfaceType, fField, fMethod;
-	/**
-	 * Creates a new test.
-	 */
-	public AccessibleTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the all kinds of accessible
-
-		// ReferenceType
-		fArrayType = getArrayType();
-		fClassType = getMainClass();
-		fInterfaceType = getInterfaceType();
-
-		// TypeComponent
-		fField = getField();
-		fMethod = getMethod();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new AccessibleTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Accessible";
-	}
-	/**
-	 * Test JDI isPackagePrivate().
-	 */
-	public void testJDIIsPackagePrivate() {
-		assertTrue("1", !fArrayType.isPackagePrivate());
-		assertTrue("2", !fClassType.isPackagePrivate());
-		assertTrue("3", !fInterfaceType.isPackagePrivate());
-		assertTrue("4", !fField.isPackagePrivate());
-		assertTrue("5", !fMethod.isPackagePrivate());
-	}
-	/**
-	 * Test JDI isPrivate().
-	 */
-	public void testJDIIsPrivate() {
-		assertTrue("1", !fField.isPrivate());
-		assertTrue("2", !fMethod.isPrivate());
-
-		// NB: isPrivate() is undefined for a type
-	}
-	/**
-	 * Test JDI isProtected().
-	 */
-	public void testJDIIsProtected() {
-		assertTrue("1", !fField.isProtected());
-		assertTrue("2", !fMethod.isProtected());
-
-		// NB: isProtected() is undefined for a type
-	}
-	/**
-	 * Test JDI isPublic().
-	 */
-	public void testJDIIsPublic() {
-		assertTrue("1", fArrayType.isPublic());
-		assertTrue("2", fClassType.isPublic());
-		assertTrue("3", fInterfaceType.isPublic());
-		assertTrue("4", fField.isPublic());
-		assertTrue("5", fMethod.isPublic());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java
deleted file mode 100644
index c20b890..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.DoubleValue;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.StringReference;
-
-/**
- * Tests for JDI com.sun.jdi.ArrayReference
- * and JDWP Array command set.
- */
-public class ArrayReferenceTest extends AbstractJDITest {
-
-	private ArrayReference fArray;
-	private ArrayReference fDoubleArray;
-
-	/**
-	 * Creates a new test.
-	 */
-	public ArrayReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get array references
-		fArray = getObjectArrayReference();
-		fDoubleArray = getNonEmptyDoubleArrayReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ArrayReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ArrayReference";
-	}
-	/**
-	 * Test JDI getValue(int), getValues(), getValues(int,int)
-	 * setValue(Value,int), setValues(List) and setValues(int,List,int,int),
-	 * and JDWP 'Array - Get values' and 'Array - Set values'.
-	 */
-	public void testJDIGetSetDoubleValue() {
-		double one = 1.0;
-		double pi = 3.1415926535;
-		double twos = 2.2;
-		double threes = 3.33;
-		double cnt = 12345;
-		double zero = 0.0;
-		double delta = 0.0;
-
-		DoubleValue dbl = (DoubleValue) fDoubleArray.getValue(0);
-		assertEquals("testJDIGetSetDoubleValue.1", one, dbl.value(), delta);
-
-		DoubleValue piValue = fVM.mirrorOf(pi);
-		DoubleValue cntValue = fVM.mirrorOf(cnt);
-		DoubleValue zeroValue = fVM.mirrorOf(zero);
-		try {
-			fDoubleArray.setValue(0, piValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("testJDIGetSetDoubleValue.3.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("testJDIGetSetDoubleValue.3.2", false);
-		}
-		DoubleValue value = (DoubleValue) fDoubleArray.getValue(0);
-		assertEquals("testJDIGetSetDoubleValue.4.1", value, piValue);
-		assertEquals("testJDIGetSetDoubleValue.4.2", pi, value.value(), delta);
-
-		// getValues()
-		List values = fDoubleArray.getValues();
-		double[] expected = new double[] { pi, twos, threes };
-		ListIterator iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			DoubleValue dv = (DoubleValue) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (dv.value() == expected[i]) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("testJDIGetSetDoubleValue.5." + dv.value(), included);
-		}
-
-		// setValues(List)
-		List newValues = values;
-		newValues.set(1, cntValue);
-		try {
-			fDoubleArray.setValues(newValues);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("testJDIGetSetDoubleValue.7.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("testJDIGetSetDoubleValue.7.2", false);
-		}
-		values = fDoubleArray.getValues();
-		assertEquals("testJDIGetSetDoubleValue.8", values, newValues);
-
-		// getValues(int,int)
-		values = fDoubleArray.getValues(1, 2);
-		expected = new double[] { cnt, threes };
-		iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			DoubleValue dv = (DoubleValue) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (dv.value() == expected[i]) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("testJDIGetSetDoubleValue.9." + dv.value(), included);
-		}
-
-		// setValues(int,List,int,int)
-		newValues = fDoubleArray.getValues(0, 2);
-		newValues.set(0, zeroValue);
-		try {
-			fDoubleArray.setValues(0, newValues, 0, 2);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("testJDIGetSetDoubleValue.11.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("testJDIGetSetDoubleValue.11.2", false);
-		}
-		values = fDoubleArray.getValues(0, 2);
-		assertEquals("testJDIGetSetDoubleValue.12", values, newValues);
-	}
-	/**
-	 * Test JDI getValue(int), getValues(), getValues(int,int)
-	 * setValue(Value,int), setValues(List) and setValues(int,List,int,int),
-	 * and JDWP 'Array - Get values' and 'Array - Set values'.
-	 */
-	public void testJDIGetSetValue() {
-		// getValue(int)
-		StringReference string = (StringReference) fArray.getValue(0);
-		assertEquals("1", "foo", string.value());
-
-		// setValue(int,Value)
-		StringReference newValue = null;
-		newValue = fVM.mirrorOf("biz");
-		try {
-			fArray.setValue(0, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("2.2", false);
-		}
-		StringReference value = (StringReference) fArray.getValue(0);
-		assertEquals("3", value, newValue);
-
-		// getValues()
-		List values = fArray.getValues();
-		String[] expected = new String[] { "biz", "bar", "hop" };
-		ListIterator iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			StringReference ref = (StringReference) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (ref.value().equals(expected[i])) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("4." + ref.value(), included);
-		}
-
-		// setValues(List)
-		List newValues = values;
-		newValue = fVM.mirrorOf("hip");
-		newValues.set(1, newValue);
-		try {
-			fArray.setValues(newValues);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("5.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("6.2", false);
-		}
-		values = fArray.getValues();
-		assertEquals("7", values, newValues);
-
-		// getValues(int,int)
-		values = fArray.getValues(1, 2);
-		expected = new String[] { "hip", "hop" };
-		iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			StringReference ref = (StringReference) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (ref.value().equals(expected[i])) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("8." + ref.value(), included);
-		}
-
-		// setValues(int,List,int,int)
-		newValues = fArray.getValues(0, 2);
-		newValue = fVM.mirrorOf("rap");
-		newValues.set(0, newValue);
-		try {
-			fArray.setValues(0, newValues, 0, 2);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("9.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("9.2", false);
-		}
-		values = fArray.getValues(0, 2);
-		assertEquals("10", values, newValues);
-
-		// test null value
-		newValues.set(0, null);
-		try {
-			fArray.setValues(0, newValues, 0, 2);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("11.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("11.2", false);
-		}
-		values = fArray.getValues(0, 2);
-		assertEquals("12", values.get(0), null);
-	}
-	/**
-	 * Test JDI length() and JDWP 'Array - Get length'.
-	 */
-	public void testJDILength() {
-		int length = fArray.length();
-		assertEquals("1", 3, length);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java
deleted file mode 100644
index 27bda01..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ArrayType;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.Type;
-
-/**
- * Tests for JDI com.sun.jdi.ArrayType
- * and JDWP Array command set.
- */
-public class ArrayTypeTest extends AbstractJDITest {
-
-	private ArrayType fType;
-	/**
-	 * Creates a new test.
-	 */
-	public ArrayTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get array type
-		fType = getArrayType();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ArrayTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ArrayType";
-	}
-	/**
-	 * Test JDI componentSignature().
-	 */
-	public void testJDIComponentSignature() {
-		String signature = fType.componentSignature();
-		assertEquals("1", "Ljava/lang/String;", signature);
-	}
-	/**
-	 * Test JDI componentType().
-	 */
-	public void testJDIComponentType() {
-		Type expected = (Type) fVM.classesByName("java.lang.String").get(0);
-		Type type = null;
-		try {
-			type = fType.componentType();
-		} catch (ClassNotLoadedException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", expected, type);
-	}
-	/**
-	 * Test JDI componentTypeName().
-	 */
-	public void testJDIComponentTypeName() {
-		String typeName = fType.componentTypeName();
-		assertEquals("1", "java.lang.String", typeName);
-	}
-	/**
-	 * Test JDI newInstance(long).
-	 */
-	public void testJDINewInstance() {
-		ArrayReference instance = fType.newInstance(1);
-		assertTrue("1", instance.type().equals(fType));
-		assertEquals("2", 1, instance.length());
-		assertTrue("3", null == instance.getValue(0));
-
-		ArrayReference instance2 = fType.newInstance(5);
-		try {
-			instance2.setValue(3, fVM.mirrorOf("Yo"));
-		} catch (InvalidTypeException exc) {
-		} catch (ClassNotLoadedException exc) {
-		}
-		assertTrue("4", instance2.getValue(2) == null);
-		assertEquals(
-			"5",
-			((StringReference) (instance2.getValue(3))).value(),
-			"Yo");
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java
deleted file mode 100644
index 5610e42..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.BooleanValue;
-
-/**
- * Tests for JDI com.sun.jdi.BooleanValue.
- */
-public class BooleanValueTest extends AbstractJDITest {
-
-	private BooleanValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public BooleanValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get boolean value for "true"
-		fValue = fVM.mirrorOf(true);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new BooleanValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.BooleanValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(true)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(false)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf(true).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(false).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", true == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java
deleted file mode 100644
index 7a1d0ba..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.request.BreakpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.BreakpointRequest.
- */
-public class BreakpointRequestTest extends AbstractJDITest {
-
-	private BreakpointRequest fRequest;
-	/**
-	 * Creates a new test .
-	 */
-	public BreakpointRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the breakpoint request
-		fRequest = getBreakpointRequest();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the breakpoint request we created in this test
-		fVM.eventRequestManager().deleteEventRequest(fRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new BreakpointRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.BreakpointRequest";
-	}
-	/**
-	 * Test JDI location().
-	 */
-	public void testJDILocation() {
-		assertEquals("1", getLocation(), fRequest.location());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java
deleted file mode 100644
index 3efe5ec..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ByteValue;
-
-/**
- * Tests for JDI com.sun.jdi.ByteValue.
- */
-public class ByteValueTest extends AbstractJDITest {
-
-	private ByteValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public ByteValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get byte value for 1
-		fValue = fVM.mirrorOf((byte) 1);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ByteValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ByteValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf((byte) 1)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf((byte) 2)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf((byte) 1).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf((byte) 2).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 1 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java
deleted file mode 100644
index 21d4f1b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.CharValue;
-
-/**
- * Tests for JDI com.sun.jdi.CharValue.
- */
-public class CharValueTest extends AbstractJDITest {
-
-	private CharValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public CharValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get char value for 'a'
-		fValue = fVM.mirrorOf('a');
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new CharValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.CharValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf('a')));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf('b')));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf('a').hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf('b').hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 'a' == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java
deleted file mode 100644
index 0567605..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.jdi.ClassLoaderReference;
-import com.sun.jdi.ReferenceType;
-
-/**
- * Tests for JDI com.sun.jdi.ClassLoaderReference.
- */
-public class ClassLoaderReferenceTest extends AbstractJDITest {
-
-	private ClassLoaderReference fClassLoader;
-	/**
-	 * Creates a new test.
-	 */
-	public ClassLoaderReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the class loader of org.eclipse.debug.jdi.tests.program.MainClass
-		fClassLoader = getClassLoaderReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassLoaderReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ClassLoaderReference";
-	}
-	/**
-	 * Test JDI definedClasses().
-	 */
-	public void testJDIDefinedClasses() {
-		Iterator defined = fClassLoader.definedClasses().iterator();
-		int i = 0;
-		while (defined.hasNext())
-			assertTrue(
-				Integer.toString(i++),
-				defined.next() instanceof ReferenceType);
-	}
-	/**
-	 * Test JDI visibleClasses().
-	 */
-	public void testJDIVisibleClasses() {
-		List visible = fClassLoader.visibleClasses();
-		Iterator defined = fClassLoader.definedClasses().iterator();
-		while (defined.hasNext()) {
-			ReferenceType next = (ReferenceType) defined.next();
-			assertTrue(next.name(), visible.contains(next));
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java
deleted file mode 100644
index 4c7b330..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.request.ClassPrepareRequest;
-
-/**
- * Tests for JDI com.sun.jdi.event.ClassPrepareEvent.
- */
-public class ClassPrepareEventTest extends AbstractJDITest {
-	private ClassPrepareRequest fRequest;
-	private ClassPrepareEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ClassPrepareEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger a class prepare event
-		fRequest = fVM.eventRequestManager().createClassPrepareRequest();
-		fEvent =
-			(ClassPrepareEvent) triggerAndWait(fRequest,
-				"ClassPrepareEvent",
-				true);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-
-		// Delete the class prepare request
-		fVM.eventRequestManager().deleteEventRequest(fRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassPrepareEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ClassPrepareEvent";
-	}
-	/**
-	 * Test JDI referenceType().
-	 */
-	public void testJDIReferenceType() {
-		assertEquals(
-			"1",
-			"org.eclipse.debug.jdi.tests.program.TestClass",
-			fEvent.referenceType().name());
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Thread", fEvent.thread().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java
deleted file mode 100644
index 3c61d10..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.request.EventRequest;
-/**
- * Listen for ClassPrepareEvent for a specific class.
- */
-public class ClassPrepareEventWaiter extends EventWaiter {
-	protected String fClassName;
-	/**
-	 * Creates a new ClassPrepareEventWaiter that waits for the given class to be loaded.
-	 */
-	public ClassPrepareEventWaiter(EventRequest request, boolean shouldGo, String className) {
-		super(request, shouldGo);
-		fClassName = className;
-	}
-	public boolean classPrepare(ClassPrepareEvent event) {
-		if (event.referenceType().name().equals(fClassName)) {
-			notifyEvent(event);
-			return fShouldGo;
-		} else
-			return true;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java
deleted file mode 100644
index d4098d3..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.request.ClassPrepareRequest;
-import com.sun.jdi.request.EventRequestManager;
-
-/**
- * Tests for JDI com.sun.jdi.request.ClassPrepareRequest.
- */
-public class ClassPrepareRequestTest extends AbstractJDITest {
-	/**
-	 * Creates a new test.
-	 */
-	public ClassPrepareRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(String[] args) {
-		new ClassPrepareRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.ClassPrepareRequest";
-	}
-	/**
-	 * Test JDI addClassFilter(String).
-	 */
-	public void testJDIAddClassFilterString() {
-		EventRequestManager requestManager = fVM.eventRequestManager();
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.*" and loads org.eclipse.debug.jdi.tests.program.TestClass1
-		ClassPrepareRequest request =
-			requestManager.createClassPrepareRequest();
-		request.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
-		ClassPrepareEvent event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent1",
-				true,
-				5000);
-		assertTrue("1", event != null);
-		assertEquals(
-			"2",
-			"org.eclipse.debug.jdi.tests.program.TestClass1",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "bogus.*" and loads org.eclipse.debug.jdi.tests.program.TestClass2
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("bogus.*");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent2",
-				true,
-				5000);
-		assertTrue("3", event == null);
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "*.TestClass3" and loads org.eclipse.debug.jdi.tests.program.TestClass3
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("*.TestClass3");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent3",
-				true,
-				5000);
-		assertTrue("4", event != null);
-		assertEquals(
-			"5",
-			"org.eclipse.debug.jdi.tests.program.TestClass3",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "*.eclipse.*.jdi.tests.*4" and loads org.eclipse.debug.jdi.tests.program.TestClass4
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("*.eclipse.*.jdi.tests.program.*4");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent4",
-				true,
-				5000);
-		assertTrue("6", event == null);
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "*.eclipse.debug.jdi.tests.program.*" and loads org.eclipse.debug.jdi.tests.program.TestClass5
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("*.eclipse.debug.jdi.tests.program.*");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent5",
-				true,
-				5000);
-		assertTrue("7", event == null);
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.TestClass6" and loads org.eclipse.debug.jdi.tests.program.TestClass6
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter(
-			"org.eclipse.debug.jdi.tests.program.TestClass6");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent6",
-				true,
-				5000);
-		assertTrue("8", event != null);
-		assertEquals(
-			"9",
-			"org.eclipse.debug.jdi.tests.program.TestClass6",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-	}
-	/**
-	 * Test JDI addClassExclusionFilter(String).
-	 */
-	public void testJDIAddClassExclusionFilterString() {
-		EventRequestManager requestManager = fVM.eventRequestManager();
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.TestClass*" and loads org.eclipse.debug.jdi.tests.program.TestClass7 and org.eclipse.debug.jdi.tests.program.TestClazz8.
-		ClassPrepareRequest request =
-			requestManager.createClassPrepareRequest();
-		request.addClassExclusionFilter(
-			"org.eclipse.debug.jdi.tests.program.TestClass*");
-		ClassPrepareEvent event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent7",
-				true,
-				5000);
-		assertTrue("1", event != null);
-		assertEquals(
-			"2",
-			"org.eclipse.debug.jdi.tests.program.TestClazz8",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.TestClazz9" and loads org.eclipse.debug.jdi.tests.program.TestClazz9 and org.eclipse.debug.jdi.tests.program.TestClazz10.
-		request = requestManager.createClassPrepareRequest();
-		request.addClassExclusionFilter(
-			"org.eclipse.debug.jdi.tests.program.TestClazz9");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent8",
-				true,
-				5000);
-		assertTrue("3", event != null);
-		assertEquals(
-			"4",
-			"org.eclipse.debug.jdi.tests.program.TestClazz10",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java
deleted file mode 100644
index d616d5c..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java
+++ /dev/null
@@ -1,360 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.Value;
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.ClassType
- * and JDWP Class command set.
- */
-public class ClassTypeTest extends AbstractJDITest {
-
-	private ClassType fType;
-	/**
-	 * Creates a new test.
-	 */
-	public ClassTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the type org.eclipse.debug.jdi.tests.program.MainClass
-		fType = getMainClass();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ClassType";
-	}
-	/**
-	 * Test JDI allFields().
-	 */
-	public void testJDIAllFields() {
-		boolean found = false;
-		Iterator it = fType.allFields().iterator();
-		while (it.hasNext()) {
-			Field fld = (Field) it.next();
-			if (fld.name().equals("fString")) {
-				found = true;
-			}
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI allInterfaces().
-	 */
-	public void testJDIAllInterfaces() {
-		List all = fType.allInterfaces();
-		boolean found = false;
-		Iterator interfaces = fType.allInterfaces().iterator();
-		while (interfaces.hasNext()) {
-			InterfaceType next = (InterfaceType) interfaces.next();
-			assertTrue(next.name(), all.contains(next));
-			if (next.name().equals("java.lang.Comparable"))
-				found = true;
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI allMethods().
-	 */
-	public void testJDIAllMethods() {
-		boolean found = false;
-		Iterator it = fType.allMethods().iterator();
-		while (it.hasNext()) {
-			Method mth = (Method) it.next();
-			if (mth.name().equals("after")) { // in Date
-				found = true;
-			}
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI concreteMethodByName().
-	 */
-	public void testJDIConcreteMethodByName() {
-		Method method = fType.concreteMethodByName("run", "()V");
-		assertTrue("1", method != null);
-		assertEquals("2", fType, method.declaringType());
-		assertTrue("3", fType.concreteMethodByName("xxx", "(I)Z") == null);
-	}
-	/**
-	 * Test JDI interfaces().
-	 */
-	public void testJDIInterfaces() {
-		boolean found = false;
-		boolean extra = false;
-		List interfaces = fType.interfaces();
-		assertEquals("1", 2, interfaces.size());
-		Iterator iterator = interfaces.iterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			assertTrue("2." + i++, next instanceof InterfaceType);
-			InterfaceType ift = (InterfaceType) next;
-			if (ift.name().equals("java.lang.Runnable"))
-				found = true;
-			if (ift.name().equals("java.lang.Comparable"))
-				extra = true;
-		}
-		assertTrue("1", found);
-		assertTrue("2", !extra);
-	}
-	/**
-	 * Test JDI invokeMethod(ThreadReference, Method, Value[]).
-	 */
-	public void testJDIInvokeMethod() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		Method inv1 =
-			fType.concreteMethodByName(
-				"invoke1",
-				"(ILjava/lang/Object;)Ljava/lang/String;");
-		List args = new ArrayList();
-		args.add(fVM.mirrorOf(41));
-		args.add(null);
-		Exception oops = null;
-		Value val = null;
-		try {
-			val = fType.invokeMethod(thread, inv1, args, 0);
-		} catch (Exception exc) {
-			oops = exc;
-		}
-		assertTrue("1", oops == null);
-		assertEquals("2", val == null ? null : ((StringReference) val).value(), "41");
-	}
-	/**
-	 * Test JDI invokeMethod - failure.
-	 */
-	public void testJDIInvokeMethodFail() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		Method inv2 = fType.concreteMethodByName("invoke2", "()V");
-		Exception good = null;
-		Exception oops = null;
-		try {
-			fType.invokeMethod(thread, inv2, new ArrayList(), 0);
-		} catch (InvocationException exc) {
-			good = exc;
-		} catch (Exception exc) {
-			oops = exc;
-		}
-		assertTrue("1", oops == null);
-		assertTrue("2", good != null);
-	}
-	/**
-	 * Test JDI locationsOfLine(int).
-	 */
-	public void testJDILocationsOfLine() {
-		int lineNumber = getLocation().lineNumber();
-		List locations = null;
-		try {
-			locations = fType.locationsOfLine(lineNumber);
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 1, locations.size());
-	}
-	/**
-	 * Test JDI methodByName
-	 */
-	public void testJDIMethodByName() {
-		assertTrue("1", fType.methodsByName("main").size() == 1);
-	}
-	/**
-	 * Test JDI methodByNameAndSignature
-	 */
-	public void testJDIMethodByNameAndSignature() {
-		assertTrue("1", fType.methodsByName("printAndSignal", "()V").size() == 1);
-	}
-	/**
-	 * Test JDI methods().
-	 */
-	public void testJDIMethods() {
-		boolean found = false;
-		Iterator it = fType.methods().iterator();
-		while (it.hasNext()) {
-			Method mth = (Method) it.next();
-			if (mth.name().equals("printAndSignal"))
-				found = true;
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI newInstance(ThreadReference, Method, Value[]).
-	 */
-	public void testJDINewInstance() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		Method constructor =
-			(Method) fType
-				.methodsByName("<init>", "(ILjava/lang/Object;Ljava/lang/Object;)V")
-				.get(0);
-		ObjectReference result = null;
-		ArrayList arguments = new ArrayList();
-		arguments.add(fVM.mirrorOf(0));
-		arguments.add(fVM.allThreads().get(0));
-		arguments.add(null);
-
-		try {
-			result = fType.newInstance(thread, constructor, arguments, 0);
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("2", false);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("3", false);
-		} catch (InvocationException e) {
-			assertTrue("4", false);
-		}
-		assertTrue("5", result != null);
-		assertTrue("6", result.referenceType().equals(fType));
-		waitUntilReady();
-	}
-	/**
-	 * Test JDI setValue(Field,Value) and JDWP 'Class - Set Fields Values'.
-	 */
-	public void testJDISetValue() {
-
-		// Get static field "fInt"
-		Field field = fType.fieldByName("fInt");
-		assertTrue("1", field != null);
-		assertTrue("2", field.isStatic());
-
-		// Remember old value
-		Value oldValue = fType.getValue(field);
-
-		// Set to new value
-		Value newValue = fVM.mirrorOf(1234);
-		try {
-			fType.setValue(field, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("3.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("3.2", false);
-		}
-
-		// Ensure the value as been set
-		assertEquals("4", fType.getValue(field), newValue);
-
-		// Cleanup
-		try {
-			fType.setValue(field, oldValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("5.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("5.2", false);
-		}
-
-		// Get static field "fString" to test if it can be set to null.
-		field = fType.fieldByName("fString");
-		assertTrue("6", field != null);
-		assertTrue("7", field.isStatic());
-
-		// Remember old value
-		oldValue = fType.getValue(field);
-
-		// Set to new value
-		newValue = null;
-		try {
-			fType.setValue(field, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("8.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("8.2", false);
-		}
-
-		// Ensure the value as been set
-		assertEquals("9", fType.getValue(field), newValue);
-
-		// Cleanup
-		try {
-			fType.setValue(field, oldValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("10.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("10.2", false);
-		}
-	}
-	/**
-	 * Test JDI subclasses().
-	 */
-	public void testJDISubclasses() {
-		List subclasses = fType.subclasses();
-		assertEquals("1", 1, subclasses.size());
-		Iterator iterator = subclasses.iterator();
-		while (iterator.hasNext()) {
-			ClassType sub = (ClassType) iterator.next();
-			assertEquals("2 " + sub.name(), fType, sub.superclass());
-		}
-	}
-	/**
-	 * Test JDI superclass() and JDWP 'Class - Get superclass'.
-	 */
-	public void testJDISuperclass() {
-		ClassType superclass = fType.superclass();
-		assertEquals("1", "java.util.Date", superclass.name());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java
deleted file mode 100644
index 830e67c..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.List;
-
-import com.sun.jdi.Type;
-
-/**
- * Tests for JDI com.sun.jdi.VirtualMachine.classesByName
- */
-public class ClassesByNameTest extends AbstractJDITest {
-
-	/**
-	 * Creates a new test.
-	 */
-	public ClassesByNameTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassesByNameTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine.classesByName";
-	}
-	/**
-	 * Test that there is a class object for 'int[]'
-	 */
-	public void testJDIIntArray() {
-		List classes = fVM.classesByName("int[]");
-		assertTrue(
-			"Should be a class for int[]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[I"));
-	}
-	/**
-	 * Test that there is a class object for 'int[][]'
-	 */
-	public void testJDIIntDoubleArray() {
-		List classes = fVM.classesByName("int[][]");
-		assertTrue(
-			"Should be a class for int[][]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[[I"));
-	}
-	public void testJDILongArray() {
-		List classes = fVM.classesByName("long[]");
-		assertTrue(
-			"Should be a class for long[]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[J"));
-	}
-	public void testJDILongDoubleArray() {
-		List classes = fVM.classesByName("long[][]");
-		assertTrue(
-			"Should be a class for long[][]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[[J"));
-	}
-	/**
-	 * Test that there is a class object for 'java.lang.String[]'
-	 */
-	public void testJDIStringArray() {
-		List classes = fVM.classesByName("java.lang.String[]");
-		assertTrue(
-			"Should be a class for java.lang.String[]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals(
-					"[Ljava/lang/String;"));
-	}
-	/**
-	 * Test that there is a class object for 'java.lang.String'
-	 */
-	public void testJDIString() {
-		List classes = fVM.classesByName("java.lang.String");
-		assertTrue(
-			"Should be a class for java.lang.String",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals(
-					"Ljava/lang/String;"));
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java
deleted file mode 100644
index 67414f2..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.DoubleValue;
-
-/**
- * Tests for JDI com.sun.jdi.DoubleValue.
- */
-public class DoubleValueTest extends AbstractJDITest {
-
-	private DoubleValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public DoubleValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get double value for 12345.6789
-		fValue = fVM.mirrorOf(12345.6789);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new DoubleValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.DoubleValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(12345.6789)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(98765.4321)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals(
-			"5",
-			fValue.hashCode(),
-			fVM.mirrorOf(12345.6789).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(98765.4321).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 12345.6789 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java
deleted file mode 100644
index b043816..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.BreakpointEvent;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.event.ThreadDeathEvent;
-import com.sun.jdi.event.ThreadStartEvent;
-import com.sun.jdi.event.VMDeathEvent;
-import com.sun.jdi.event.VMDisconnectEvent;
-
-/**
- * An event listener that handles all kinds of event coming from the VM.
- */
-
-public interface EventListener {
-	/**
-	 * Handles an access watchpoint event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean accessWatchpoint(AccessWatchpointEvent event);
-	/**
-	 * Handles a breakpoint event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean breakpoint(BreakpointEvent event);
-	/**
-	 * Handles a class prepare event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean classPrepare(ClassPrepareEvent event);
-	/**
-	 * Handles a class unload event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean classUnload(ClassUnloadEvent event);
-	/**
-	 * Handles an exception event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean exception(ExceptionEvent event);
-	public boolean methodEntry(MethodEntryEvent event);
-	public boolean methodExit(MethodExitEvent event);
-	/**
-	 * Handles a modification watchpoint event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean modificationWatchpoint(ModificationWatchpointEvent event);
-	/**
-	 * Handles a step event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean step(StepEvent event);
-	/**
-	 * Handles a thread death event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean threadDeath(ThreadDeathEvent event);
-	/**
-	 * Handles a thread start event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean threadStart(ThreadStartEvent event);
-	/**
-	 * Handles a vm death event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean vmDeath(VMDeathEvent event);
-	/**
-	 * Handles a vm disconnect event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean vmDisconnect(VMDisconnectEvent event);
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java
deleted file mode 100644
index d1b5ee3..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.Vector;
-
-import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.BreakpointEvent;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.EventIterator;
-import com.sun.jdi.event.EventQueue;
-import com.sun.jdi.event.EventSet;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.event.ThreadDeathEvent;
-import com.sun.jdi.event.ThreadStartEvent;
-import com.sun.jdi.event.VMDeathEvent;
-import com.sun.jdi.event.VMDisconnectEvent;
-import com.sun.jdi.request.EventRequest;
-
-/**
- * An event reader that continuously reads events coming from the VM
- * and dispatch them to the registered listeners.
- */
-
-public class EventReader extends AbstractReader {
-	private EventQueue fEventQueue;
-	private Vector fEventListeners = new Vector(); // A Vector of EventListener
-	/*
-	 * Creates a new event reader that will read from the given event queue.
-	 */
-	public EventReader(String name, EventQueue queue) {
-		super(name);
-		fEventQueue = queue;
-	}
-	/*
-	 * Registers the given event listener.
-	 */
-	public synchronized void addEventListener(EventListener listener) {
-		fEventListeners.addElement(listener);
-	}
-	/**
-	 * Dispatches the given event to the given listener.
-	 * Returns whether the VM should be resumed.
-	 */
-	private boolean dispath(Event event, EventListener listener) {
-		if (event instanceof AccessWatchpointEvent)
-			return listener.accessWatchpoint((AccessWatchpointEvent) event);
-		if (event instanceof BreakpointEvent)
-			return listener.breakpoint((BreakpointEvent) event);
-		if (event instanceof ClassPrepareEvent)
-			return listener.classPrepare((ClassPrepareEvent) event);
-		if (event instanceof ClassUnloadEvent)
-			return listener.classUnload((ClassUnloadEvent) event);
-		if (event instanceof ExceptionEvent)
-			return listener.exception((ExceptionEvent) event);
-		if (event instanceof MethodEntryEvent)
-			return listener.methodEntry((MethodEntryEvent) event);
-		if (event instanceof MethodExitEvent)
-			return listener.methodExit((MethodExitEvent) event);
-		if (event instanceof ModificationWatchpointEvent)
-			return listener.modificationWatchpoint(
-				(ModificationWatchpointEvent) event);
-		if (event instanceof StepEvent)
-			return listener.step((StepEvent) event);
-		if (event instanceof ThreadDeathEvent)
-			return listener.threadDeath((ThreadDeathEvent) event);
-		if (event instanceof ThreadStartEvent)
-			return listener.threadStart((ThreadStartEvent) event);
-		if (event instanceof VMDisconnectEvent)
-			return listener.vmDisconnect((VMDisconnectEvent) event);
-		if (event instanceof VMDeathEvent)
-			return listener.vmDeath((VMDeathEvent) event);
-		return true;
-	}
-	/**
-	 * Continuously reads events that are coming from the event queue.
-	 */
-	protected void readerLoop() {
-		while (!fIsStopping) {
-			try {
-				if (!fIsStopping) {
-					// Get the next event
-					EventSet eventSet = fEventQueue.remove();
-
-					// Dispatch the events
-					boolean shouldGo = true;
-					EventIterator iterator = eventSet.eventIterator();
-					while (iterator.hasNext()) {
-						Event event = iterator.nextEvent();
-						for (int i = 0; i < fEventListeners.size(); i++) {
-							EventListener listener =
-								(EventListener) fEventListeners.elementAt(i);
-							shouldGo = shouldGo & dispath(event, listener);
-						}
-						if (event instanceof VMDeathEvent)
-							stop();
-					}
-
-					// Let the VM go if it was interrupted
-					if ((!fIsStopping)
-						&& (eventSet != null)
-						&& (eventSet.suspendPolicy() == EventRequest.SUSPEND_ALL)
-						&& shouldGo)
-						synchronized (this) {
-							fEventQueue.virtualMachine().resume();
-						}
-				}
-			} catch (InterruptedException e) {
-				if (!fIsStopping) {
-					System.out.println("Event reader loop was interrupted");
-					return;
-				}
-			} catch (VMDisconnectedException e) {
-				return;
-			}
-		}
-	}
-	/*
-	 * De-registers the given event listener.
-	 */
-	public synchronized void removeEventListener(EventListener listener) {
-		fEventListeners.removeElement(listener);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java
deleted file mode 100644
index 3d07d5e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
deleted file mode 100644
index d94dadb..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.LinkedList;
-import java.util.List;
-
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.EventRequest.
- */
-public class EventRequestTest extends AbstractJDITest {
-
-	private List fRequests = new LinkedList();
-	/**
-	 * Creates a new test.
-	 */
-	public EventRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of request
-		if (fVM.canWatchFieldAccess())
-			fRequests.add(getAccessWatchpointRequest());
-		fRequests.add(getBreakpointRequest());
-		fRequests.add(fVM.eventRequestManager().createClassPrepareRequest());
-		fRequests.add(fVM.eventRequestManager().createClassUnloadRequest());
-		fRequests.add(getExceptionRequest());
-		if (fVM.canWatchFieldModification())
-			fRequests.add(getModificationWatchpointRequest());
-		fRequests.add(
-			fVM.eventRequestManager().createStepRequest(
-				getThread(),
-				StepRequest.STEP_LINE,
-				StepRequest.STEP_OVER));
-		fRequests.add(fVM.eventRequestManager().createThreadDeathRequest());
-		fRequests.add(fVM.eventRequestManager().createThreadStartRequest());
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the requests we created in this test
-		fVM.eventRequestManager().deleteEventRequests(fRequests);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new EventRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.EventRequest";
-	}
-	/**
-	 * Test JDI disable(), enable(), isEnable() and setEnable(boolean).
-	 */
-	public void testJDIEnable() {
-		for (int i = 0; i < fRequests.size(); i++) {
-			EventRequest request = (EventRequest) fRequests.get(i);
-			assertTrue("1." + i, !request.isEnabled());
-			request.setEnabled(true);
-			assertTrue("2." + i, request.isEnabled());
-			request.setEnabled(false);
-			assertTrue("3." + i, !request.isEnabled());
-			request.enable();
-			assertTrue("4." + i, request.isEnabled());
-			request.disable();
-			assertTrue("5." + i, !request.isEnabled());
-		}
-	}
-	/**
-	 * Test JDI setSuspendPolicy(int) and suspendPolicy().
-	 */
-	public void testJDISuspendPolicy() {
-		int policy = EventRequest.SUSPEND_EVENT_THREAD;
-		for (int i = 0; i < fRequests.size(); i++) {
-			EventRequest request = (EventRequest) fRequests.get(i);
-			request.setSuspendPolicy(policy);
-		}
-		for (int i = 0; i < fRequests.size(); i++) {
-			EventRequest request = (EventRequest) fRequests.get(i);
-			assertTrue(String.valueOf(i), request.suspendPolicy() == policy);
-		}
-	}
-	/**
-	 * Test JDI putProperty and getProperty.
-	 */
-	public void testJDIProperties() {
-		EventRequest request = (EventRequest) fRequests.get(0);
-		request.putProperty(new Integer(0), "prop1");
-		String prop = (String) request.getProperty(new Integer(0));
-		assertTrue("1", prop.equals("prop1"));
-
-		request.putProperty(new Integer(0), null);
-		prop = (String) request.getProperty(new Integer(0));
-		assertTrue("2", prop == null);
-
-		request.putProperty(new Integer(0), "prop2");
-		request.putProperty(new Integer(0), "prop3");
-		prop = (String) request.getProperty(new Integer(0));
-		assertTrue("3", prop.equals("prop3"));
-
-		request.putProperty(new Integer(0), null);
-		prop = (String) request.getProperty(new Integer(0));
-		assertTrue("4", prop == null);
-
-		request.putProperty(new Integer(1), null);
-		prop = (String) request.getProperty(new Integer(1));
-		assertTrue("5", prop == null);
-
-		request.putProperty(new Integer(1), "prop1");
-		prop = (String) request.getProperty(new Integer(1));
-		assertTrue("6", prop.equals("prop1"));
-
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java
deleted file mode 100644
index b64b88b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import com.sun.jdi.event.Event;
-import com.sun.jdi.request.EventRequest;
-
-/**
- * Tests for JDI com.sun.jdi.event.Event.
- */
-public class EventTest extends AbstractJDITest {
-	private HashMap fAllEvents = new HashMap();
-	/**
-	 * Creates a new test.
-	 */
-	public EventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// All events...
-
-		EventRequest request;
-
-		// AccessWatchpointEvent
-		if (fVM.canWatchFieldAccess()) {
-			request = getAccessWatchpointRequest();
-			fAllEvents.put(
-				request,
-				triggerAndWait(request, "AccessWatchpointEvent", true));
-		}
-
-		// BreakpointEvent
-		request = getBreakpointRequest();
-		fAllEvents.put(
-			request,
-			triggerAndWait(request, "BreakpointEvent", true));
-
-		// ClassPrepareEvent
-		// TO DO
-
-		// ClassUnloadEvent
-		// TO DO
-
-		// ExceptionEvent
-		// TO DO
-
-		// ModificationWatchpointEvent
-		if (fVM.canWatchFieldModification()) {
-			request = getModificationWatchpointRequest();
-			fAllEvents.put(
-				request,
-				triggerAndWait(request, "ModificationWatchpointEvent", true));
-		}
-
-		// StepEvent
-		// TO DO
-
-		// ThreadEndEvent
-		// TO DO
-
-		// ThreadStartEvent
-		// TO DO
-
-		// VMDeathEvent
-		// TO DO?
-
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fBool" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Remove the requests
-		fVM.eventRequestManager().deleteEventRequests(
-			new LinkedList(fAllEvents.keySet()));
-
-		// Set the value of the "fBool" field back to its original value
-		resetField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new EventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.Event";
-	}
-	/**
-	 * Test JDI request().
-	 */
-	public void testJDIRequest() {
-		Iterator iterator = fAllEvents.keySet().iterator();
-		while (iterator.hasNext()) {
-			EventRequest request = (EventRequest) iterator.next();
-			Event event = (Event) fAllEvents.get(request);
-
-			assertEquals(event.toString(), request, event.request());
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
deleted file mode 100644
index 8a0d691..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.BreakpointEvent;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.event.ThreadDeathEvent;
-import com.sun.jdi.event.ThreadStartEvent;
-import com.sun.jdi.event.VMDeathEvent;
-import com.sun.jdi.event.VMDisconnectEvent;
-import com.sun.jdi.request.EventRequest;
-
-/**
- * Listen for a specific kind of event.
- */
-public class EventWaiter implements EventListener {
-	protected EventRequest fRequest;
-	protected boolean fShouldGo;
-	protected Event fEvent;
-	/**
-	 * Creates a new EventWaiter for the given request. Sets whether it
-	 * should let the VM go after it got the event.
-	 */
-	public EventWaiter(EventRequest request, boolean shouldGo) {
-		fRequest = request;
-		fShouldGo = shouldGo;
-	}
-	public boolean accessWatchpoint(AccessWatchpointEvent event) {
-		return handleEvent(event);
-	}
-	public boolean methodEntry(MethodEntryEvent event) {
-		return handleEvent(event);
-	}
-	public boolean methodExit(MethodExitEvent event) {
-		return handleEvent(event);
-	}
-	public boolean breakpoint(BreakpointEvent event) {
-		return handleEvent(event);
-	}
-	public boolean classPrepare(ClassPrepareEvent event) {
-		return handleEvent(event);
-	}
-	public boolean classUnload(ClassUnloadEvent event) {
-		return handleEvent(event);
-	}
-	public boolean exception(ExceptionEvent event) {
-		return handleEvent(event);
-	}
-	/**
-	 * Handles an incoming event.
-	 * Returns whether the VM should be resumed if it was suspended.
-	 */
-	protected boolean handleEvent(Event event) {
-		if ((event.request() != null) && (event.request().equals(fRequest))) {
-			notifyEvent(event);
-			return fShouldGo;
-		} else
-			return true;
-	}
-	public boolean modificationWatchpoint(ModificationWatchpointEvent event) {
-		return handleEvent(event);
-	}
-	/**
-	 * Notify any object that is waiting for an event.
-	 */
-	synchronized protected void notifyEvent(Event event) {
-		notify();
-		fEvent = event;
-	}
-	public boolean step(StepEvent event) {
-		return handleEvent(event);
-	}
-	public boolean threadDeath(ThreadDeathEvent event) {
-		return handleEvent(event);
-	}
-	public boolean threadStart(ThreadStartEvent event) {
-		return handleEvent(event);
-	}
-	public boolean vmDeath(VMDeathEvent event) {
-		if (fEvent == null) {
-			// This is the last event we can ever get an this was not the one we expected
-			notifyEvent(null);
-			return true;
-		}
-		return handleEvent(event);
-	}
-	public boolean vmDisconnect(VMDisconnectEvent event) {
-		return handleEvent(event);
-	}
-	/**
-	 * Waits for the first event corresponding to this waiter's request.
-	 */
-	synchronized public Event waitEvent() throws InterruptedException {
-		if (fEvent == null) // If event didn't already come in
-			wait();
-		Event result = fEvent;
-		fEvent = null;
-		return result;
-	}
-	/**
-	 * Waits for the first event corresponding to this waiter's request
-	 * for the given time (in ms). If it times out, return null.
-	 */
-	synchronized public Event waitEvent(long time)
-		throws InterruptedException {
-		if (fEvent == null) // If event didn't already come in
-			wait(time);
-		Event result = fEvent;
-		fEvent = null;
-		return result;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java
deleted file mode 100644
index 89a667a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.event.ExceptionEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.ExceptionEvent.
- */
-public class ExceptionEventTest extends AbstractJDITest {
-
-	private ExceptionEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ExceptionEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger an exception event
-		fEvent =
-			(ExceptionEvent) triggerAndWait(getExceptionRequest(),
-				"ExceptionEvent",
-				false);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has interrupted the VM, so let it go
-		fVM.resume();
-
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ExceptionEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ExceptionEvent";
-	}
-	/**
-	 * Test JDI catchLocation().
-	 */
-	public void testJDICatchLocation() {
-		// Uncaught exception
-		assertTrue("1", fEvent.catchLocation() == null);
-
-		// TO DO: Caught exception
-	}
-	/**
-	 * Test JDI exception().
-	 */
-	public void testJDIException() {
-		ReferenceType expected =
-			(ReferenceType) fVM.classesByName("java.lang.Error").get(0);
-		assertEquals("1", expected, fEvent.exception().referenceType());
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Exception Event", fEvent.thread().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java
deleted file mode 100644
index 4244f4b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.request.ExceptionRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.ExceptionRequest.
- */
-public class ExceptionRequestTest extends AbstractJDITest {
-
-	private ExceptionRequest fRequest;
-	/**
-	 * Creates a new test .
-	 */
-	public ExceptionRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the exception request
-		fRequest = getExceptionRequest();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the exception request we created in this test
-		fVM.eventRequestManager().deleteEventRequest(fRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ExceptionRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.ExceptionRequest";
-	}
-	/**
-	 * Test JDI exception().
-	 */
-	public void testJDIException() {
-		assertTrue("1", fRequest.exception() == null);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java
deleted file mode 100644
index a3e9edd..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.Field;
-
-/**
- * Tests for JDI com.sun.jdi.Field.
- */
-public class FieldTest extends AbstractJDITest {
-
-	private Field fField;
-	/**
-	 * Creates a new test.
-	 */
-	public FieldTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get static field "fObject"
-		fField = getField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new FieldTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Field";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fField.equals(fField));
-		Field other = getField("fString");
-		assertTrue("2", !fField.equals(other));
-		assertTrue("3", !fField.equals(new Object()));
-		assertTrue("4", !fField.equals(null));
-	}
-	/**
-	 * Test JDI isTransient().
-	 */
-	public void testJDIIsTransient() {
-		assertTrue("1", !fField.isTransient());
-	}
-	/**
-	 * Test JDI isVolatile().
-	 */
-	public void testJDIIsVolatile() {
-		assertTrue("1", !fField.isVolatile());
-	}
-	/**
-	 * Test JDI type().
-	 */
-	public void testJDIType() {
-		try {
-			assertEquals("1", getMainClass(), fField.type());
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI typeName().
-	 */
-	public void testJDITypeName() {
-		assertEquals(
-			"1",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			fField.typeName());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java
deleted file mode 100644
index b44382e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class FileConsoleReader extends AbstractReader {
-	private InputStream fInput;
-	private FileOutputStream fFileOutputStream;
-	/*
-	 * Creates a new console reader that will read from the given input stream.
-	 */
-	public FileConsoleReader(String name, String fileName, InputStream input) {
-		super(name);
-		fInput = input;
-		try {
-			fFileOutputStream = new FileOutputStream(new File(fileName));
-		} catch (IOException e) {
-			System.out.println("Got exception: " + e.getMessage());
-		}
-	}
-	/**
-	 * Continuously reads events that are coming from the event queue.
-	 */
-	protected void readerLoop() {
-		BufferedReader input = new BufferedReader(new InputStreamReader(fInput));
-		try {
-			int read = 0;
-			while (!fIsStopping && read != -1) {
-				read = input.read();
-				if (read != -1) {
-					fFileOutputStream.write(read);
-				}
-				fFileOutputStream.flush();
-			}
-		} catch (IOException e) {
-		}
-	}
-
-	public void stop() {
-		try {
-			fFileOutputStream.close();
-		} catch (IOException e) {
-			System.out.println("Got exception: " + e.getMessage());
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java
deleted file mode 100644
index d535922..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.FloatValue;
-
-/**
- * Tests for JDI com.sun.jdi.FloatValue.
- */
-public class FloatValueTest extends AbstractJDITest {
-
-	private FloatValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public FloatValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get float value for 123.45f
-		fValue = fVM.mirrorOf(123.45f);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new FloatValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.FloatType";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(123.45f)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(54.321f)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf(123.45f).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(54.321f).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 123.45f == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java
deleted file mode 100644
index a701a1e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.Location;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.request.ClassPrepareRequest;
-import com.sun.jdi.request.ClassUnloadRequest;
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for the hot code replacement JDI extension.
- */
-public class HotCodeReplacementTest extends AbstractJDITest {
-	/**
-	 * Creates a new test.
-	 */
-	public HotCodeReplacementTest() {
-		super();
-	}
-	private void dropTopFrame(
-		ThreadReference thread,
-		org.eclipse.jdi.hcr.ThreadReference hcrThread) {
-		// Get stack size
-		int stackSize = 0;
-		try {
-			stackSize = thread.frames().size();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("dropTopFrame.1", false);
-		}
-
-		// Create and install step out request
-		StepRequest request =
-			fVM.eventRequestManager().createStepRequest(
-				thread,
-				StepRequest.STEP_MIN,
-				StepRequest.STEP_OUT);
-		request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		request.enable();
-
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(request, false);
-		fEventReader.addEventListener(waiter);
-
-		// Do return
-		boolean finallyBlocksSkipped = hcrThread.doReturn(null, true);
-		assertTrue("dropTopFrame.2", !finallyBlocksSkipped);
-
-		// Wait for the event to come in
-		Event event = waitForEvent(waiter, 10000); // Wait 10s max
-		assertTrue("dropTopFrame.3", event != null);
-		fEventReader.removeEventListener(waiter);
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		// Check thread has dropped top frame
-		assertTrue("dropTopFrame.4", thread.isSuspended());
-		int newStackSize = 0;
-		try {
-			newStackSize = thread.frames().size();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("dropTopFrame.5", false);
-		}
-		assertEquals("dropTopFrame.6", stackSize - 1, newStackSize);
-	}
-	private void getClassFileVersion() {
-		org.eclipse.jdi.hcr.ReferenceType type =
-			(org.eclipse.jdi.hcr.ReferenceType) getMainClass();
-		int version = type.getClassFileVersion();
-		assertEquals("getClassFileVersion.1", -211226504, version);
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(String[] args) {
-		new HotCodeReplacementTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "Hot code replacement extension to JDI (org.eclipse.jdi.hcr) tests";
-	}
-	private void reenterOnExit(ThreadReference thread) {
-		// Get top frame's location
-		Location location = null;
-		try {
-			StackFrame frame = (StackFrame) thread.frames(0, 1).get(0);
-			location = frame.location();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("reenterOnExit.1", false);
-		}
-
-		// Create and install reenter step request
-		org.eclipse.jdi.hcr.EventRequestManager eventRequestManager =
-			(org.eclipse.jdi.hcr.EventRequestManager) fVM.eventRequestManager();
-		org.eclipse.jdi.hcr.ReenterStepRequest request =
-			eventRequestManager.createReenterStepRequest(thread);
-		request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		request.enable();
-
-		// Prepare to receive the step event
-		EventWaiter waiter = new EventWaiter(request, false);
-		fEventReader.addEventListener(waiter);
-
-		// Resume thread with a doReturn so that the frame is reentered right away
-		 ((org.eclipse.jdi.hcr.ThreadReference) thread).doReturn(null, false);
-
-		// Wait for the step event to come in
-		StepEvent event = (StepEvent) waitForEvent(waiter, 10000); // Wait 10s max
-		assertTrue("reenterOnExit.2", event != null);
-		fEventReader.removeEventListener(waiter);
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		// Check that the top frame location is as expected
-		Location newLocation = null;
-		try {
-			StackFrame frame = (StackFrame) thread.frames(0, 1).get(0);
-			newLocation = frame.location();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("reenterOnExit.3", false);
-		}
-		assertTrue("reenterOnExit.4", !newLocation.equals(location));
-		assertTrue("reenterOnExit.5", newLocation.codeIndex() <= location.codeIndex());
-
-	}
-	private void reloadClasses() {
-		// Gets the old class
-		ReferenceType oldType = getMainClass();
-
-		// Create and install class unload and class prepare event requests
-		ClassUnloadRequest unloadRequest =
-			fVM.eventRequestManager().createClassUnloadRequest();
-		unloadRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		unloadRequest.enable();
-		ClassPrepareRequest loadRequest =
-			fVM.eventRequestManager().createClassPrepareRequest();
-		loadRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		loadRequest.enable();
-
-		// Prepare to receive the class unload event
-		EventWaiter unloadEventWaiter = new EventWaiter(unloadRequest, true);
-		fEventReader.addEventListener(unloadEventWaiter);
-
-		// Prepare to receive the class prepare event
-		EventWaiter loadEventWaiter = new EventWaiter(loadRequest, true);
-		fEventReader.addEventListener(loadEventWaiter);
-
-		// Reload classes
-		org.eclipse.jdi.hcr.VirtualMachine vm =
-			(org.eclipse.jdi.hcr.VirtualMachine) fVM;
-		int result =
-			vm.classesHaveChanged(
-				new String[] { "org.eclipse.debug.jdi.tests.program.MainClass" });
-		assertEquals("reloadClasses.1", org.eclipse.jdi.hcr.VirtualMachine.RELOAD_SUCCESS, result);
-
-		// Wait for the class unload event to come in
-		ClassUnloadEvent unloadEvent =
-			(ClassUnloadEvent) waitForEvent(unloadEventWaiter, 10000);
-		// Wait 10s max
-		assertTrue("reloadClasses.2", unloadEvent != null);
-		fEventReader.removeEventListener(unloadEventWaiter);
-		fVM.eventRequestManager().deleteEventRequest(unloadRequest);
-		assertEquals(
-			"reloadClasses.3",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			unloadEvent.className());
-
-		// Wait for the class prepare event to come in
-		ClassPrepareEvent loadEvent =
-			(ClassPrepareEvent) waitForEvent(loadEventWaiter, 10000);
-		// Wait 10s max
-		assertTrue("reloadClasses.4", loadEvent != null);
-		fEventReader.removeEventListener(loadEventWaiter);
-		fVM.eventRequestManager().deleteEventRequest(loadRequest);
-		ReferenceType newType = loadEvent.referenceType();
-		assertEquals(
-			"reloadClasses.5",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			newType.name());
-		assertTrue("reloadClasses.6", !oldType.equals(newType));
-	}
-	/**
-	 * Use case 1:
-	 * . get a thread and suspend it
-	 * . get hot code replacement capabilities
-	 * . drop the top a frame
-	 * . reload some classes
-	 * . request reeenter on exit
-	 * . resume thread
-	 * . get step event
-	 * . get class file version for some classes
-	 */
-	public void testJDIUseCase1() {
-		// Get the suspended thread
-		ThreadReference thread = getThread();
-		assertTrue("1", thread.isSuspended());
-		assertEquals("2", 1, thread.suspendCount());
-		org.eclipse.jdi.hcr.ThreadReference hcrThread =
-			(org.eclipse.jdi.hcr.ThreadReference) thread;
-
-		org.eclipse.jdi.hcr.VirtualMachine vm =
-			(org.eclipse.jdi.hcr.VirtualMachine) fVM;
-
-		
-		// Drop the top a frame
-		try {
-			if (vm.canDoReturn()) {
-				dropTopFrame(thread, hcrThread);
-			}
-		} catch (UnsupportedOperationException e) {
-			//not using a VM that supports the extension
-			return;
-		}
-
-		// Reload classes
-		if (vm.canReloadClasses())
-			reloadClasses();
-
-		// Reenter on exit
-		if (vm.canReenterOnExit())
-			reenterOnExit(thread);
-
-		// Get class file version
-		// MML: commented out, otherwise this test fails after a change to
-		// the main class.
-		//	if (vm.canGetClassFileVersion()) {
-		//		getClassFileVersion();
-		//	}
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		waitUntilReady();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java
deleted file mode 100644
index 580564a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.IntegerValue;
-
-/**
- * Tests for JDI com.sun.jdi.IntegerValue.
- */
-public class IntegerValueTest extends AbstractJDITest {
-
-	private IntegerValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public IntegerValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get int value for 12345
-		fValue = fVM.mirrorOf(12345);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new IntegerValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.IntegerValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(12345)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(54321)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf(12345).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(54321).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 12345 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java
deleted file mode 100644
index 9608a64..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.Method;
-
-/**
- * Tests for JDI com.sun.jdi.InterfaceType
- * and JDWP Interface command set.
- */
-public class InterfaceTypeTest extends AbstractJDITest {
-
-	private InterfaceType fType;
-	/**
-	 * Creates a new test.
-	 */
-	public InterfaceTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get interface type "org.eclipse.debug.jdi.tests.program.Printable"
-		fType = getInterfaceType();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new InterfaceTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.InterfaceType";
-	}
-	/**
-	 * Test JDI allFields().
-	 */
-	public void testJDIAllFields() {
-		assertEquals("1", 1, fType.allFields().size());
-	}
-	/**
-	 * Test JDI allMethods().
-	 */
-	public void testJDIAllMethods() {
-		boolean found = false;
-		Iterator it = fType.allMethods().iterator();
-		while (it.hasNext()) {
-			Method mth = (Method) it.next();
-			if (mth.name().equals("print")) {
-				found = true;
-			}
-		}
-		assertTrue("1", fType.allMethods().size() == 1);
-		assertTrue("2", found);
-	}
-	/**
-	 * Test JDI implementors().
-	 */
-	public void testJDIImplementors() {
-		List implementors = fType.implementors();
-		assertEquals("1", 1, implementors.size());
-		ClassType implementor = (ClassType) implementors.get(0);
-		assertEquals("2", getMainClass(), implementor);
-	}
-	/**
-	 * Test JDI subinterfaces().
-	 */
-	public void testJDISubinterfaces() {
-		List subinterfaces = fType.subinterfaces();
-		assertEquals("1", 0, subinterfaces.size());
-	}
-	/**
-	 * Test JDI superinterfaces().
-	 */
-	public void testJDISuperinterfaces() {
-		List superinterfaces = fType.superinterfaces();
-		assertEquals("1", 1, superinterfaces.size());
-		InterfaceType superinterface = (InterfaceType) superinterfaces.get(0);
-		InterfaceType expected =
-			(InterfaceType) fVM.classesByName("java.lang.Cloneable").get(0);
-		assertEquals("2", expected, superinterface);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java
deleted file mode 100644
index dc29b4b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.lang.reflect.Method;
-import junit.framework.TestCase;
-
-/**
- * Wrapper to be able to use the JDI tests in a test suite without
- * starting and shuting down the VM after each test.
- */
-public class JDITestCase extends TestCase {
-	private AbstractJDITest fTest;
-	/**
-	 * Creates a new test for the given JDI test.
-	 */
-	public JDITestCase(AbstractJDITest test, String name) {
-		super(name);
-		fTest = test;
-	}
-	/**
-	 * Override to run the test and assert its state.
-	 * @exception Throwable if any exception is thrown
-	 */
-	protected void runTest() throws Throwable {
-		Method runMethod = null;
-		try {
-			runMethod = fTest.getClass().getMethod(getName(), new Class[0]);
-		} catch (NoSuchMethodException e) {
-			e.fillInStackTrace();
-			throw e;
-		}
-		try {
-			fTest.verbose("Running " + getName());
-			runMethod.invoke(fTest, new Class[0]);
-		} catch (java.lang.reflect.InvocationTargetException e) {
-			if (e.getTargetException() instanceof NotYetImplementedException)
-				System.out.println("\n" + getName() + " is not yet implemented.");
-			else {
-				e.fillInStackTrace();
-				throw e.getTargetException();
-			}
-		} catch (IllegalAccessException e) {
-			e.fillInStackTrace();
-			throw e;
-		}
-	}
-	/**
-	 * Init tests
-	 */
-	protected void setUp() {
-		// Ignore setUp since it is done once for all tests in the test suite
-	}
-	/**
-	 * Tears down the fixture.
-	 */
-	protected void tearDown() {
-		// Ignore tearDown since it is done once for all tests in the test suite
-	}
-	/**
-	 * Returns a string representation of the test case
-	 */
-	public String toString() {
-		return fTest.getClass().getName() + "." + getName() + "()";
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java
deleted file mode 100644
index 245d8b8..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-/**
- * A JDI test suite runs all tests defined in a JDI test case class.
- * It runs the setUp method once before running the tests and the
- * tearDown method once after.
- */
-public class JDITestSuite extends TestSuite {
-	private AbstractJDITest fTest;
-	/**
-	 * Creates a new test suite for the given JDI test.
-	 */
-	public JDITestSuite(AbstractJDITest test) {
-		super();
-		fTest = test;
-	}
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 */
-	public void run(TestResult result) {
-		fTest.setUp();
-		super.run(result);
-		fTest.tearDown();
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java
deleted file mode 100644
index 72d5701..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.LocalVariable;
-
-/**
- * Tests for JDI com.sun.jdi.LocalVariable.
- */
-public class LocalVariableTest extends AbstractJDITest {
-
-	private LocalVariable fVar;
-	/**
-	 * Creates a new test.
-	 */
-	public LocalVariableTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Wait for the program to be ready
-		waitUntilReady();
-
-		// Get local variable "t" in the frame running MainClass.run()
-		fVar = getLocalVariable();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LocalVariableTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.LocalVariable";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fVar.equals(fVar));
-		LocalVariable other = null;
-		try {
-			other = getFrame(RUN_FRAME_OFFSET).visibleVariableByName("o");
-		} catch (AbsentInformationException e) {
-			assertTrue("2", false);
-		}
-		assertTrue("3", !fVar.equals(other));
-		assertTrue("4", !fVar.equals(new Object()));
-		assertTrue("5", !fVar.equals(null));
-		assertTrue("6", fVar.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI isArgument().
-	 */
-	public void testJDIIsArgument() {
-		assertTrue("1", !fVar.isArgument());
-	}
-	/**
-	 * Test JDI isVisible(StackFrame).
-	 */
-	public void testJDIIsVisible() {
-		assertTrue("1", fVar.isVisible(getFrame(RUN_FRAME_OFFSET)));
-
-		boolean gotException = false;
-		try {
-			fVar.isVisible(getFrame(0));
-		} catch (IllegalArgumentException e) {
-			gotException = true;
-		}
-		assertTrue("2", gotException);
-	}
-	/**
-	 * Test JDI name().
-	 */
-	public void testJDIName() {
-		assertEquals("1", "t", fVar.name());
-	}
-	/**
-	 * Test JDI signature().
-	 */
-	public void testJDISignature() {
-		assertEquals("1", "Ljava/lang/Thread;", fVar.signature());
-	}
-	/**
-	 * Test JDI type().
-	 */
-	public void testJDIType() {
-		try {
-			assertEquals(
-				"1",
-				fVM.classesByName("java.lang.Thread").get(0),
-				fVar.type());
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI typeName().
-	 */
-	public void testJDITypeName() {
-		assertEquals("1", "java.lang.Thread", fVar.typeName());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java
deleted file mode 100644
index 6c04169..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.Locatable;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.Locatable.
- */
-public class LocatableTest extends AbstractJDITest {
-
-	private List fLocatables = new LinkedList();
-	private List fRequests = new LinkedList();
-	/**
-	 * Creates a new test.
-	 */
-	public LocatableTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of locatable
-
-		BreakpointRequest bp = getBreakpointRequest();
-		fLocatables.add(bp); // BreakpointRequest
-
-		//ExceptionRequest er = getExceptionRequest();
-		//fLocatables.add(triggerAndWait(er, 'e')); // ExceptionEvent
-
-		fLocatables.add(getMethod()); // Method
-
-		fLocatables.add(triggerStepAndWait()); // StepEvent
-
-		fRequests.add(bp);
-		fLocatables.add(triggerAndWait(bp, "BreakpointEvent", true));
-		// BreakpointEvent
-
-		if (fVM.canWatchFieldAccess()) {
-			AccessWatchpointRequest ap = getAccessWatchpointRequest();
-			fRequests.add(ap);
-			fLocatables.add(triggerAndWait(ap, "AccessWatchpointEvent", true));
-			// AccessWatchpointEvent
-		}
-
-		if (fVM.canWatchFieldModification()) {
-			ModificationWatchpointRequest mp =
-				getModificationWatchpointRequest();
-			fRequests.add(mp);
-			fLocatables.add(
-				triggerAndWait(mp, "ModificationWatchpointEvent", false));
-			// ModificationWatchpointEvent
-		}
-
-		// Note we can use the stack frame only if the thread is suspended,
-		// that's why the previoue triggerAndWait doesn't resume the thread
-		// and this Locatable is added last in the list
-		fLocatables.add(getFrame(RUN_FRAME_OFFSET)); // StackFrame
-
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fBool" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Delete the event requests we created in this test
-		fVM.eventRequestManager().deleteEventRequests(fRequests);
-
-		// Set the value of the "fBool" field back to its original value
-		resetField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LocatableTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Locatable";
-	}
-	/**
-	 * Test JDI location()
-	 */
-	public void testJDILocation() {
-		ListIterator iterator = fLocatables.listIterator();
-		while (iterator.hasNext()) {
-			Locatable locatable = (Locatable) iterator.next();
-			Location location = locatable.location();
-			assertTrue("1." + locatable, location != null);
-			assertTrue(
-				"2." + locatable,
-				(location.codeIndex()) >= 0 || (location.codeIndex() == -1));
-			assertTrue("3." + locatable, location.declaringType() != null);
-			assertTrue(
-				"4." + locatable,
-				(location.lineNumber() > 0) || (location.lineNumber() == -1));
-			assertTrue(
-				"5." + locatable,
-				(location.method() instanceof Method)
-					|| (location.method() == null));
-			try {
-				assertTrue(
-					"6." + locatable,
-					(location.sourceName() instanceof String)
-						|| (location.sourceName() == null));
-			} catch (AbsentInformationException e) {
-				assertTrue("7", false);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java
deleted file mode 100644
index 58b7c91..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-
-/**
- * Tests for JDI com.sun.jdi.Location.
- */
-public class LocationTest extends AbstractJDITest {
-
-	private Location fLocation;
-	/**
-	 * Creates a new test.
-	 */
-	public LocationTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Ensure we're in a good state
-		fVM.resume();
-		waitUntilReady();
-
-		// Get the location of the stack frame running the method MainClass.run()
-		fLocation = getLocation();
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LocationTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Location";
-	}
-	/**
-	 * Test JDI codeIndex().
-	 */
-	public void testJDICodeIndex() {
-		fLocation.codeIndex();
-	}
-	/**
-	 * Test JDI declaringType().
-	 */
-	public void testJDIDeclaringType() {
-		ReferenceType expected = getMainClass();
-		ReferenceType declaringType = fLocation.declaringType();
-		assertEquals("1", expected.name(), declaringType.name());
-		// Use name to work around a pb in Sun's VM
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fLocation.equals(fLocation));
-		Location other = getFrame(0).location();
-		assertTrue("2", !fLocation.equals(other));
-		assertTrue("3", !fLocation.equals(new Object()));
-		assertTrue("4", !fLocation.equals(null));
-		assertTrue("5", fLocation.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI lineNumber().
-	 */
-	public void testJDILineNumber() {
-		assertEquals("1", 110, fLocation.lineNumber());
-	}
-	/**
-	 * Test JDI method().
-	 */
-	public void testJDIMethod() {
-		Method method = fLocation.method();
-		assertEquals("1", "print", method.name());
-	}
-	/**
-	 * Test JDI sourceName().
-	 */
-	public void testJDISourceName() {
-		String sourceName = null;
-		try {
-			sourceName = fLocation.sourceName();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", "MainClass.java", sourceName);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java
deleted file mode 100644
index ec3e443..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.LongValue;
-
-/**
- * Tests for JDI com.sun.jdi.LongValue.
- */
-public class LongValueTest extends AbstractJDITest {
-
-	private LongValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public LongValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get long value for 123456789l
-		fValue = fVM.mirrorOf(123456789l);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LongValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.LongValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(123456789l)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(987654321l)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals(
-			"5",
-			fValue.hashCode(),
-			fVM.mirrorOf(123456789l).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(987654321l).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 123456789l == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java
deleted file mode 100644
index 1b07dfe..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.request.MethodEntryRequest;
-
-public class MethodEntryRequestTest extends AbstractJDITest {
-
-	public void localSetUp() {
-	}
-
-	public void localTearDown() {
-		fVM.resume();
-		waitUntilReady();
-	}
-
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MethodEntryRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.MethodEntryRequest";
-	}
-
-	protected MethodEntryRequest getMethodEntryRequest() {
-		return fVM.eventRequestManager().createMethodEntryRequest();
-	}
-
-	public void testJDIWithoutFilter() {
-		MethodEntryRequest request = getMethodEntryRequest();
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		assertEquals(getThread(), event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassExclusionFilter() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		request.addClassExclusionFilter("org.eclipse.debug.jdi.tests.program.*");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertTrue("1", !r.name().startsWith("org.eclipse.debug.jdi.tests.program."));
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter1() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		ClassType clazz = getClass("java.io.PrintStream");
-		request.addClassFilter(clazz);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals(clazz, r);
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter2() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		request.addClassFilter("java.io.PrintStream");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals("java.io.PrintStream", r.name());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithThreadFilter() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		ThreadReference thr = getMainThread();
-		request.addThreadFilter(thr);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		assertEquals(thr, event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java
deleted file mode 100644
index 7a5293d..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.request.MethodExitRequest;
-
-public class MethodExitRequestTest extends AbstractJDITest {
-
-	public void localSetUp() {
-	}
-	public void localTearDown() {
-		fVM.resume();
-		waitUntilReady();
-	}
-
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MethodExitRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.MethodExitRequest";
-	}
-
-	protected MethodExitRequest getMethodExitRequest() {
-		return fVM.eventRequestManager().createMethodExitRequest();
-	}
-	public void testJDIWithoutFilter() {
-		MethodExitRequest request = getMethodExitRequest();
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		assertEquals(getThread(), event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassExclusionFilter() {
-		MethodExitRequest request = getMethodExitRequest();
-		request.addClassExclusionFilter("org.eclipse.debug.jdi.tests.program.*");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertTrue("1", !r.name().startsWith("org.eclipse.debug.jdi.tests.program."));
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter1() {
-		MethodExitRequest request = getMethodExitRequest();
-		ClassType clazz = getClass("java.io.PrintStream");
-		request.addClassFilter(clazz);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals(clazz, r);
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter2() {
-		MethodExitRequest request = getMethodExitRequest();
-		request.addClassFilter("java.io.PrintStream");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals("java.io.PrintStream", r.name());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithThreadFilter() {
-		MethodExitRequest request = getMethodExitRequest();
-		ThreadReference thr = getMainThread();
-		request.addThreadFilter(thr);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		assertEquals(thr, event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java
deleted file mode 100644
index f4d2c82..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.List;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.LocalVariable;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.NativeMethodException;
-import com.sun.jdi.VoidType;
-
-/**
- * Tests for JDI com.sun.jdi.Method
- * and JDWP Method command set.
- */
-public class MethodTest extends AbstractJDITest {
-
-	private Method fMethod1;
-	/**
-	 * Creates a new test.
-	 */
-	public MethodTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get method useLocalVars(Thread, MainClass)
-		fMethod1 =
-			getMethod(
-				"useLocalVars",
-				"(Ljava/lang/Thread;Lorg/eclipse/debug/jdi/tests/program/MainClass;)V");
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MethodTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Method";
-	}
-	/**
-	 * Test JDI arguments() and JDWP 'Method - Get variable table'.
-	 */
-	public void testJDIArguments() {
-		List arguments = null;
-		try {
-			arguments = fMethod1.arguments();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, arguments.size());
-		assertEquals("3", "t", ((LocalVariable) arguments.get(0)).name());
-		assertEquals("4", "o", ((LocalVariable) arguments.get(1)).name());
-	}
-	/**
-	 * Test JDI argumentTypeNames().
-	 */
-	public void testJDIArgumentTypeNames() {
-		List names = fMethod1.argumentTypeNames();
-		assertEquals("1", 2, names.size());
-		assertEquals("2", "java.lang.Thread", names.get(0));
-		assertEquals(
-			"3",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			names.get(1));
-	}
-	/**
-	 * Test JDI argumentTypes().
-	 */
-	public void testJDIArgumentTypes() {
-		List types = null;
-		try {
-			types = fMethod1.argumentTypes();
-		} catch (ClassNotLoadedException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, types.size());
-		assertEquals("3", fVM.classesByName("java.lang.Thread").get(0), types.get(0));
-		assertEquals(
-			"4",
-			fVM.classesByName("org.eclipse.debug.jdi.tests.program.MainClass").get(0),
-			types.get(1));
-	}
-	/**
-	 * Test JDI bytecodes().
-	 */
-	public void testJDIBytecodes() {
-		if (!fVM.canGetBytecodes())
-			return;
-
-		byte[] bytecodes = fMethod1.bytecodes();
-		assertEquals("1", 27, bytecodes.length);
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fMethod1.equals(fMethod1));
-		Method other = getMethod("run", "()V");
-		assertTrue("2", !fMethod1.equals(other));
-		assertTrue("3", !fMethod1.equals(new Object()));
-		assertTrue("4", !fMethod1.equals(null));
-		assertTrue("5", fMethod1.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI isAbstract().
-	 */
-	public void testJDIIsAbstract() {
-		assertTrue("1", !fMethod1.isAbstract());
-	}
-	/**
-	 * Test JDI isConstructor().
-	 */
-	public void testJDIIsConstructor() {
-		assertTrue("1", !fMethod1.isConstructor());
-	}
-	/**
-	 * Test JDI isNative().
-	 */
-	public void testJDIIsNative() {
-		assertTrue("1", !fMethod1.isNative());
-	}
-	/**
-	 * Test JDI isStaticInitializer().
-	 */
-	public void testJDIIsStaticInitializer() {
-		assertTrue("1", !fMethod1.isStaticInitializer());
-	}
-	/**
-	 * Test JDI isSynchronized().
-	 */
-	public void testJDIIsSynchronized() {
-		assertTrue("1", !fMethod1.isSynchronized());
-	}
-	/**
-	 * Test JDI locationOfCodeIndex(long).
-	 */
-	public void testJDILocationOfCodeIndex() {
-		Location expected = fMethod1.location();
-		Location result = fMethod1.locationOfCodeIndex(expected.codeIndex());
-		assertEquals("1", expected, result);
-	}
-	/**
-	 * Test JDI locationsOfLine(int) and JDWP 'Method - Get line table'.
-	 */
-	public void testJDILocationsOfLine() {
-		int expected = fMethod1.location().lineNumber();
-		List locations = null;
-		try {
-			locations = fMethod1.locationsOfLine(expected);
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 1, locations.size());
-		assertEquals("3", expected, ((Location) locations.get(0)).lineNumber());
-	}
-	/**
-	 * Test JDI returnType().
-	 */
-	public void testJDIReturnType() {
-		try {
-			assertTrue("1", fMethod1.returnType() instanceof VoidType);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI returnTypeName().
-	 */
-	public void testJDIReturnTypeName() {
-		assertEquals("1", "void", fMethod1.returnTypeName());
-	}
-	/**
-	 * Test JDI variables() and JDWP 'Method - Get variable table'.
-	 */
-	public void testJDIVariables() {
-		List variables = null;
-		try {
-			variables = fMethod1.variables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, variables.size());
-		assertEquals("3", "t", ((LocalVariable) variables.get(0)).name());
-		assertEquals("4", "o", ((LocalVariable) variables.get(1)).name());
-	}
-
-	/**
-	 * Test JDI variables() and JDWP 'Method - Get variable table'
-	 * for native method.
-	 */
-	public void testJDINativeMethodVariables() {
-		Method method = getMethod("java.lang.Thread", "sleep", "(J)V");
-
-		try {
-			method.variables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		} catch (NativeMethodException nme) {
-			return;
-		}
-		assertTrue("Should have thrown native method exception", false);
-	}
-
-	/**
-	 * Test JDI variables() and JDWP 'Method - Get variable table'
-	 * for non-native method with a long argument.
-	 */
-	public void testJDIMethodVariablesWithLong() {
-		List variables = null;
-		Method method = getMethod("variablesTest", "(J)V");
-
-		try {
-			variables = method.variables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("1", 1, variables.size());
-	}
-
-	/**
-	 * Test JDI variablesByName(String) and JDWP 'Method - Get variable table'.
-	 */
-	public void testJDIVariablesByName() {
-		String varName = "t";
-		List variables = null;
-		try {
-			variables = fMethod1.variablesByName(varName);
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 1, variables.size());
-		assertEquals("3", varName, ((LocalVariable) variables.get(0)).name());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java
deleted file mode 100644
index 3cb83c8..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.Mirror;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.Mirror.
- */
-public class MirrorTest extends AbstractJDITest {
-	List fMirrors = new LinkedList();
-	/**
-	 * Creates a new test.
-	 */
-	public MirrorTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of concrete mirror that can be found in the VM
-		// in alphabetical order.
-
-		//TO DO: Add events too
-
-		fMirrors = new LinkedList();
-
-		if (fVM.canWatchFieldAccess())
-			fMirrors.add(getAccessWatchpointRequest());
-		// AccessWatchpointRequest
-
-		fMirrors.add(getObjectArrayReference()); // ArrayReference
-		fMirrors.add(getArrayType()); // ArrayType
-		fMirrors.add(fVM.mirrorOf(true)); // BooleanValue
-		fMirrors.add(getBreakpointRequest()); // BreakpointRequest
-		fMirrors.add(fVM.mirrorOf((byte) 1)); // ByteValue
-		fMirrors.add(fVM.mirrorOf('1')); // CharValue
-		fMirrors.add(getClassLoaderReference()); // ClassLoaderReference
-		fMirrors.add(getMainClass()); // ClassType
-		fMirrors.add(fVM.mirrorOf(12345.6789)); // DoubleValue
-		fMirrors.add(fVM.eventRequestManager()); // EventRequestManager
-		fMirrors.add(fVM.eventQueue()); // EventQueue
-		fMirrors.add(getField()); // Field
-		fMirrors.add(fVM.mirrorOf(123.45f)); // FieldValue
-		fMirrors.add(fVM.mirrorOf(12345)); // IntegerValue
-		fMirrors.add(getInterfaceType()); // InterfaceType
-		fMirrors.add(getLocalVariable()); // LocalVariable
-		fMirrors.add(getLocation()); // Location
-		fMirrors.add(fVM.mirrorOf(123456789l)); // LongValue
-		fMirrors.add(getMethod()); // Method
-
-		if (fVM.canWatchFieldModification())
-			fMirrors.add(getModificationWatchpointRequest());
-		// ModificationWatchpointRequest
-
-		fMirrors.add(getObjectReference()); // ObjectReference
-		fMirrors.add(fVM.mirrorOf((short) 12345)); // ShortValue
-		fMirrors.add(getFrame(RUN_FRAME_OFFSET)); // StackFrame
-		fMirrors.add(getStringReference()); // StringReference
-		fMirrors.add(getThread().threadGroup()); // ThreadGroupReference
-		fMirrors.add(getThread()); // ThreadReference
-		fMirrors.add(fVM); // VirtualMachine
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		ListIterator iterator = fMirrors.listIterator();
-		while (iterator.hasNext()) {
-			Object mirror = iterator.next();
-
-			// Delete the access watchpoint request we created in this test
-			if (mirror instanceof AccessWatchpointRequest)
-				fVM.eventRequestManager().deleteEventRequest(
-					(AccessWatchpointRequest) mirror);
-
-			// Delete the breakpoint request we created in this test
-			if (mirror instanceof BreakpointRequest)
-				fVM.eventRequestManager().deleteEventRequest(
-					(BreakpointRequest) mirror);
-
-			// Delete the modification watchpoint request we created in this test
-			if (mirror instanceof ModificationWatchpointRequest)
-				fVM.eventRequestManager().deleteEventRequest(
-					(ModificationWatchpointRequest) mirror);
-		}
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MirrorTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Mirror";
-	}
-	/**
-	 * Test JDI toString().
-	 */
-	public void testJDIToString() {
-		for (int i = 0; i < fMirrors.size(); i++) {
-			Mirror mirror = (Mirror) fMirrors.get(i);
-			assertTrue(Integer.toString(i), mirror.toString() instanceof String);
-		}
-	}
-	/**
-	 * Test JDI virtualMachine().
-	 */
-	public void testJDIVirtualMachine() {
-		for (int i = 0; i < fMirrors.size(); i++) {
-			Mirror mirror = (Mirror) fMirrors.get(i);
-			assertEquals(Integer.toString(i), fVM, mirror.virtualMachine());
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java
deleted file mode 100644
index 8a04c0c..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.StringReference;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.request.WatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.ModificationWatchpointEvent.
- */
-public class ModificationWatchpointEventTest extends AbstractJDITest {
-
-	private ModificationWatchpointEvent fWatchpointEvent;
-	private WatchpointRequest fWatchpointRequest;
-	/**
-	 * Creates a new test.
-	 */
-	public ModificationWatchpointEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger a static modification watchpoint event
-		fWatchpointRequest = getStaticModificationWatchpointRequest();
-		fWatchpointEvent =
-			(ModificationWatchpointEvent) triggerAndWait(fWatchpointRequest,
-				"StaticModificationWatchpointEvent",
-				false);
-		// Interrupt the VM so that we can test valueToBe()
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fString" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Remove the modification watchpoint request
-		fVM.eventRequestManager().deleteEventRequest(fWatchpointRequest);
-
-		// Set the value of the "fString" field back to its original value
-		resetStaticField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ModificationWatchpointEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ModificationWatchpointEvent";
-	}
-	/**
-	 * Test JDI valueToBe().
-	 */
-	public void testJDIValueToBe() {
-		assertEquals(
-			"1",
-			"Hello Universe",
-			((StringReference) fWatchpointEvent.valueToBe()).value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java
deleted file mode 100644
index 65cba62..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-public class NotYetImplementedException extends RuntimeException {
-	/**
-	 * NotYetImplemented constructor comment.
-	 */
-	public NotYetImplementedException() {
-		super();
-	}
-	/**
-	 * NotYetImplemented constructor comment.
-	 * @param s java.lang.String
-	 */
-	public NotYetImplementedException(String s) {
-		super(s);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java
deleted file mode 100644
index 9067ea2..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * A null console reader that continuously reads from the VM input stream
- * so that the VM doesn't block when the program writes to the stout.
- */
-
-public class NullConsoleReader extends AbstractReader {
-	private InputStream fInput;
-	/*
-	 * Creates a new console reader that will read from the given input stream.
-	 */
-	public NullConsoleReader(String name, InputStream input) {
-		super(name);
-		fInput = input;
-	}
-	/**
-	 * Continuously reads events that are coming from the event queue.
-	 */
-	protected void readerLoop() {
-		java.io.BufferedReader input =
-			new BufferedReader(new InputStreamReader(fInput));
-		try {
-			int read = 0;
-			while (!fIsStopping && read != -1) {
-				read = input.read();
-			}
-		} catch (IOException e) {
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java
deleted file mode 100644
index 3206d76..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import junit.framework.Test;
-
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.IntegerValue;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.Value;
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.ObjectReference
- * and JDWP Object command set.
- */
-public class ObjectReferenceTest extends AbstractJDITest {
-
-	private ObjectReference fObject;
-
-	/**
-	 * Creates a new test.
-	 */
-	public ObjectReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Make sure the object is in expected state (eg. it has not entered a monitor)
-		waitUntilReady();
-
-		// Get static field "fObject"
-		fObject = getObjectReference();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed and suspended the Test Thread. Make sure this
-		// thread is suspended at the right location
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ObjectReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ObjectReference";
-	}
-	/**
-	 * Returns all tests 
-	 */
-	protected Test suite() {
-		JDITestSuite suite = (JDITestSuite) super.suite();
-		Vector testNames = getAllMatchingTests("testLast");
-		Iterator iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-		return suite;
-	}
-	/**
-	 * Test JDI disableCollection(). enableCollection() and isCollected().
-	 */
-	public void testJDIDisableEnableCollection() {
-		assertTrue("1", !fObject.isCollected());
-		fObject.disableCollection();
-		fObject.enableCollection();
-	}
-	/**
-	 * Test JDI entryCount().
-	 */
-	public void testJDIEntryCount() {
-		if (fVM.canGetMonitorInfo()) {
-			// Ensure we're in a good state
-			fVM.resume();
-			waitUntilReady();
-
-			try {
-				assertEquals("1", 1, fObject.entryCount());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fObject.equals(fObject));
-		ObjectReference other = getThread();
-		assertTrue("2", !fObject.equals(other));
-		assertTrue("3", !fObject.equals(new Object()));
-		assertTrue("4", !fObject.equals(null));
-		assertTrue("5", fObject.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI getValue(Field), getValues(List) and setValue(Field,Value)
-	 * and JDWP 'Object - Get Fields Values' and 'Object - Set Fields Values'.
-	 */
-	public void testJDIGetSetValues() {
-		// setup
-		ReferenceType type = fObject.referenceType();
-		List fields = type.fields();
-		ListIterator iterator = fields.listIterator();
-		List instanceFields = new LinkedList();
-		while (iterator.hasNext()) {
-			Field field = (Field) iterator.next();
-			if (!field.isStatic())
-				instanceFields.add(field);
-		}
-		Field field = (Field) instanceFields.get(4);
-		assertEquals("1", "fChar", field.name());
-
-		// getValues(List)
-		Map values = fObject.getValues(instanceFields);
-		assertTrue("2", values.size() == 7);
-		Value value = (Value) values.get(field);
-		assertEquals("3", value, fVM.mirrorOf('a'));
-
-		// setValue(Field,Value)
-		Value newValue = fVM.mirrorOf('b');
-		try {
-			fObject.setValue(field, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("4.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("4.2", false);
-		}
-
-		// getValue(Field)
-		assertEquals("5", fObject.getValue(field), newValue);
-
-		// test set and get null value.
-		field = (Field) instanceFields.get(5);
-
-		assertEquals("6", "fString2", field.name());
-		try {
-			fObject.setValue(field, null);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("7.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("7.2", false);
-		}
-
-		// getValue(Field)
-		assertEquals("8", fObject.getValue(field), null);
-
-		// test get final value.
-		field = (Field) instanceFields.get(6);
-		assertEquals("9", "fString3", field.name());
-
-		// The value is null and should be because it's final
-		//assertEquals("10", fVM.mirrorOf("HEY"), fObject.getValue(field));
-
-	}
-	/**
-	 * Test JDI invokeMethod.
-	 */
-	public void testJDIInvokeMethod() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-		waitUntilReady();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		ClassType ct = (ClassType) fObject.referenceType();
-		Method inv =
-			ct.concreteMethodByName("invoke3", "(Ljava/lang/String;Ljava/lang/Object;)I");
-		List args = new ArrayList();
-		args.add(fVM.mirrorOf("888"));
-		args.add(null);
-		Exception oops = null;
-		Value val = null;
-		try {
-			val = fObject.invokeMethod(thread, inv, args, 0);
-		} catch (ClassNotLoadedException exc) {
-			oops = exc;
-		} catch (IncompatibleThreadStateException exc) {
-			oops = exc;
-		} catch (InvalidTypeException exc) {
-			oops = exc;
-		} catch (InvocationException exc) {
-			oops = exc;
-		}
-		assertTrue("1", oops == null);
-		assertEquals("2", val == null ? 0 : ((IntegerValue) val).value(), 888);
-	}
-	/**
-	 * Test JDI invokeMethod - failure.
-	 */
-	public void testJDIInvokeMethodFail() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-		waitUntilReady();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		ClassType ct = (ClassType) fObject.referenceType();
-		Method inv = ct.concreteMethodByName("invoke4", "()J");
-		Exception good = null, oops = null;
-		try {
-			fObject.invokeMethod(thread, inv, new ArrayList(), 0);
-		} catch (ClassNotLoadedException exc) {
-			oops = exc;
-		} catch (IncompatibleThreadStateException exc) {
-			oops = exc;
-		} catch (InvalidTypeException exc) {
-			oops = exc;
-		} catch (InvocationException exc) {
-			good = exc;
-		}
-		assertTrue("1", oops == null);
-		assertTrue("2", good != null);
-	}
-	/**
-	 * Test JDI owningThread().
-	 */
-	public void testJDIOwningThread() {
-		if (fVM.canGetMonitorInfo()) {
-			// Ensure we're in a good state
-			fVM.resume();
-			waitUntilReady();
-
-			try {
-				assertEquals("1", getThread(), fObject.owningThread());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI referenceType() and JDWP 'Type - Get type'.
-	 */
-	public void testJDIReferenceType() {
-		ReferenceType type = fObject.referenceType();
-		assertEquals("1", type.name(), "org.eclipse.debug.jdi.tests.program.MainClass");
-	}
-	/**
-	 * Test JDI uniqueID().
-	 */
-	public void testJDIUniqueID() {
-		fObject.uniqueID();
-	}
-	/**
-	 * Test JDI waitingThreads().
-	 */
-	public void testJDIWaitingThreads() {
-		if (fVM.canGetMonitorInfo()) {
-			try {
-				assertEquals("1", 0, fObject.waitingThreads().size());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java
deleted file mode 100644
index d420b37..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.PrimitiveValue;
-
-/**
- * Tests for JDI com.sun.jdi.PrimitiveValue.
- */
-public class PrimitiveValueTest extends AbstractJDITest {
-
-	private PrimitiveValue fBoolean,
-		fByte,
-		fChar,
-		fDouble,
-		fFloat,
-		fInt,
-		fLong,
-		fShort;
-	/**
-	 * Creates a new test.
-	 */
-	public PrimitiveValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of prinitive values
-		fBoolean = fVM.mirrorOf(true);
-		fByte = fVM.mirrorOf((byte) 1);
-		fChar = fVM.mirrorOf('a');
-		fDouble = fVM.mirrorOf(12345.6789);
-		fFloat = fVM.mirrorOf(12345.6789f);
-		fInt = fVM.mirrorOf(12345);
-		fLong = fVM.mirrorOf(123456789l);
-		fShort = fVM.mirrorOf((short) 12345);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new PrimitiveValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.PrimitiveValue";
-	}
-	/**
-	 * Test JDI booleanValue().
-	 */
-	public void testJDIBooleanValue() {
-		assertTrue("1", fBoolean.booleanValue());
-		assertTrue("2", fByte.booleanValue());
-		assertTrue("3", fChar.booleanValue());
-		assertTrue("4", fDouble.booleanValue());
-		assertTrue("5", fFloat.booleanValue());
-		assertTrue("6", fInt.booleanValue());
-		assertTrue("7", fLong.booleanValue());
-		assertTrue("8", fShort.booleanValue());
-	}
-	/**
-	 * Test JDI byteValue().
-	 */
-	public void testJDIByteValue() {
-		assertEquals("1", 1, fBoolean.byteValue());
-		assertEquals("2", 1, fByte.byteValue());
-		assertEquals("3", 97, fChar.byteValue());
-		assertEquals("4", 57, fDouble.byteValue());
-		assertEquals("5", 57, fFloat.byteValue());
-		assertEquals("6", 57, fInt.byteValue());
-		assertEquals("7", 21, fLong.byteValue());
-		assertEquals("8", 57, fShort.byteValue());
-	}
-	/**
-	 * Test JDI charValue().
-	 */
-	public void testJDICharValue() {
-		assertEquals("1", (char) 1, fBoolean.charValue());
-		assertEquals("2", (char) 1, fByte.charValue());
-		assertEquals("3", 'a', fChar.charValue());
-		assertEquals("4", (char) 12345, fDouble.charValue());
-		assertEquals("5", (char) 12345, fFloat.charValue());
-		assertEquals("6", (char) 12345, fInt.charValue());
-		assertEquals("7", (char) 52501, fLong.charValue());
-		assertEquals("8", (char) 12345, fShort.charValue());
-	}
-	/**
-	 * Test JDI doubleValue().
-	 */
-	public void testJDIDoubleValue() {
-		assertEquals("1", (double) 1, fBoolean.doubleValue(), 0);
-		assertEquals("2", (double) 1, fByte.doubleValue(), 0);
-		assertEquals("3", (double) 97, fChar.doubleValue(), 0);
-		assertEquals("4", (double) 12345.6789, fDouble.doubleValue(), 0);
-		assertEquals("5", (double) 12345.6789, fFloat.doubleValue(), 0.001);
-		assertEquals("6", (double) 12345, fInt.doubleValue(), 0);
-		assertEquals("7", (double) 123456789, fLong.doubleValue(), 0);
-		assertEquals("8", (double) 12345, fShort.doubleValue(), 0);
-	}
-	/**
-	 * Test JDI floatValue().
-	 */
-	public void testJDIFloatValue() {
-		assertEquals("1", (float) 1, fBoolean.floatValue(), 0);
-		assertEquals("2", (float) 1, fByte.floatValue(), 0);
-		assertEquals("3", (float) 97, fChar.floatValue(), 0);
-		assertEquals("4", (float) 12345.6789, fDouble.floatValue(), 0);
-		assertEquals("5", (float) 12345.6789, fFloat.floatValue(), 0.001);
-		assertEquals("6", (float) 12345, fInt.floatValue(), 0);
-		assertEquals("7", (float) 123456789, fLong.floatValue(), 100);
-		assertEquals("8", (float) 12345, fShort.floatValue(), 0);
-	}
-	/**
-	 * Test JDI intValue().
-	 */
-	public void testJDIIntValue() {
-		assertEquals("1", 1, fBoolean.intValue());
-		assertEquals("2", 1, fByte.intValue());
-		assertEquals("3", 97, fChar.intValue());
-		assertEquals("4", 12345, fDouble.intValue());
-		assertEquals("5", 12345, fFloat.intValue());
-		assertEquals("6", 12345, fInt.intValue());
-		assertEquals("7", 123456789, fLong.intValue());
-		assertEquals("8", 12345, fShort.intValue());
-	}
-	/**
-	 * Test JDI longValue().
-	 */
-	public void testJDILongValue() {
-		assertEquals("1", 1l, fBoolean.longValue());
-		assertEquals("2", 1l, fByte.longValue());
-		assertEquals("3", 97l, fChar.longValue());
-		assertEquals("4", 12345l, fDouble.longValue());
-		assertEquals("5", 12345l, fFloat.longValue());
-		assertEquals("6", 12345l, fInt.longValue());
-		assertEquals("7", 123456789l, fLong.longValue());
-		assertEquals("8", 12345l, fShort.longValue());
-	}
-	/**
-	 * Test JDI shortValue().
-	 */
-	public void testJDIShortValue() {
-		assertEquals("1", 1, fBoolean.shortValue());
-		assertEquals("2", 1, fByte.shortValue());
-		assertEquals("3", 97, fChar.shortValue());
-		assertEquals("4", 12345, fDouble.shortValue());
-		assertEquals("5", 12345, fFloat.shortValue());
-		assertEquals("6", 12345, fInt.shortValue());
-		assertEquals("7", -13035, fLong.shortValue());
-		assertEquals("8", 12345, fShort.shortValue());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java
deleted file mode 100644
index ef635f3..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java
+++ /dev/null
@@ -1,365 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import com.sun.jdi.Field;
-import com.sun.jdi.IntegerValue;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-
-/**
- * Tests for JDI com.sun.jdi.ReferenceType
- * and JDWP Type command set.
- */
-public class ReferenceTypeTest extends AbstractJDITest {
-
-	private List fTypes = new LinkedList();
-
-	// These must match what is done in localSetUp
-	private boolean[] fSystemClassLoader = { true, true, false, false };
-	private boolean[] fHasMethods = { true, false, true, true };
-	private boolean[] fIsAbstract = { false, false, false, true };
-	private boolean[] fIsFinal = { false, true, false, false };
-	private boolean[] fIsStatic = { false, false, false, false };
-	private String[] fTypeName =
-		{
-			"java.lang.Object",
-			"java.lang.String[]",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			"org.eclipse.debug.jdi.tests.program.Printable" };
-	private int fObjectIndex = 0;
-	private int fMainClassIndex = 2;
-
-	/**
-	 * Creates a new test.
-	 */
-	public ReferenceTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of reference type
-		fTypes.add(getSystemType());
-		fTypes.add(getArrayType());
-		fTypes.add(getMainClass());
-		fTypes.add(getInterfaceType());
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ReferenceTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ReferenceType";
-	}
-	/**
-	 * Test JDI allFields().
-	 */
-	public void testJDIAllFields() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			Iterator all = type.allFields().iterator();
-			int i = 0;
-			while (all.hasNext())
-				assertTrue("1." + type.name() + "." + i++, all.next() instanceof Field);
-		}
-	}
-	/**
-	 * Test JDI allMethods().
-	 */
-	public void testJDIAllMethods() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			Iterator all = type.allMethods().iterator();
-			int i = 0;
-			while (all.hasNext())
-				assertTrue("1." + type.name() + "." + i++, all.next() instanceof Method);
-		}
-	}
-	/**
-	 * Test JDI classLoader() and JDWP 'Type - Get class loader'.
-	 */
-	public void testJDIClassLoader() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			ObjectReference classLoader = type.classLoader();
-			assertTrue("1." + i, (classLoader == null) == fSystemClassLoader[i]);
-		}
-	}
-	/**
-	 * Test JDI classObject().
-	 */
-	public void testJDIClassObject() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue(type.name(), type.classObject() instanceof ObjectReference);
-		}
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		ReferenceType other =
-			(ReferenceType) fVM.classesByName("java.lang.String").get(0);
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name() + ".1", type.equals(type));
-			assertTrue("1." + type.name() + ".2", !type.equals(other));
-			assertTrue("1." + type.name() + ".3", !type.equals(fVM));
-			assertTrue("1." + type.name() + ".4", !type.equals(new Object()));
-			assertTrue("1." + type.name() + ".5", !type.equals(null));
-			assertTrue("1." + type.name() + ".6", type.hashCode() != other.hashCode());
-		}
-	}
-	/**
-	 * Test JDI failedToInitialize().
-	 */
-	public void testJDIFailedToInitialize() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), !type.failedToInitialize());
-		}
-	}
-	/**
-	 * Test JDI fieldByName(String).
-	 */
-	public void testJDIFieldByName() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = (ReferenceType) fTypes.get(fMainClassIndex);
-		Field field = type.fieldByName("fObject");
-		assertTrue("1." + type.name(), field != null);
-	}
-	/**
-	 * Test JDI fields() and JDWP 'Type - Get Fields'.
-	 */
-	public void testJDIFields() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			Iterator fields = type.fields().iterator();
-			int i = 0;
-			while (fields.hasNext())
-				assertTrue("1." + i++ +"." + type.name(), fields.next() instanceof Field);
-		}
-	}
-	/**
-	 * Test JDI getValue(Field) and JDWP 'Type - Get Fields Values'.
-	 */
-	public void testJDIGetValue() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = (ReferenceType) fTypes.get(fMainClassIndex);
-		Field field = type.fieldByName("fInt");
-		assertTrue("1." + type.name(), field != null);
-		assertTrue("2." + type.name(), type.getValue(field) instanceof IntegerValue);
-	}
-	/**
-	 * Test JDI getValues(List) and JDWP 'Type - Get Fields Values'.
-	 */
-	public void testJDIGetValues() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = (ReferenceType) fTypes.get(fMainClassIndex);
-
-		// Get field values
-		List fields = type.fields();
-		ListIterator iterator = fields.listIterator();
-		List staticFields = new LinkedList();
-		while (iterator.hasNext()) {
-			Field field = (Field) iterator.next();
-			if (field.isStatic())
-				staticFields.add(field);
-		}
-		Map values = type.getValues(staticFields);
-		assertEquals("1." + type.name(), 8, values.size());
-
-		// Get value of field fInt in MainClass
-		Field field = (Field) staticFields.get(0);
-		int i = 0;
-		while (!field.name().equals("fInt"))
-			field = (Field) staticFields.get(++i);
-
-		// Ensure it is an integer value
-		assertTrue("2." + type.name(), values.get(field) instanceof IntegerValue);
-	}
-	/**
-	 * Test JDI isAbstract().
-	 */
-	public void testJDIIsAbstract() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			if (type.name().equals("org.eclipse.debug.jdi.tests.program.Printable"))
-				assertTrue("1." + type.name(), type.isAbstract());
-			else
-				assertTrue("2." + type.name(), !type.isAbstract());
-		}
-	}
-	/**
-	 * Test JDI isFinal().
-	 */
-	public void testJDIIsFinal() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			assertTrue("1." + i, type.isFinal() == fIsFinal[i]);
-		}
-	}
-	/**
-	 * Test JDI isInitialized().
-	 */
-	public void testJDIIsInitialized() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), type.isInitialized());
-		}
-	}
-	/**
-	 * Test JDI isPrepared().
-	 */
-	public void testJDIIsPrepared() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), type.isPrepared());
-		}
-	}
-	/**
-	 * Test JDI isStatic().
-	 */
-	public void testJDIIsStatic() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), !type.isStatic());
-		}
-	}
-	/**
-	 * Test JDI isVerified().
-	 */
-	public void testJDIIsVerified() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			if (i != fObjectIndex) {
-				ReferenceType type = (ReferenceType) fTypes.get(i);
-				assertTrue("1." + type.name(), type.isVerified());
-			}
-		}
-	}
-	/**
-	 * Test JDI methods() and JDWP 'Type - Get Methods'.
-	 */
-	public void testJDIMethods() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			List methods = type.methods();
-			assertTrue("" + i, (methods.size() != 0) == fHasMethods[i]);
-		}
-	}
-	/**
-	 * Test JDI methodsByName(String) and methodsByName(String, String).
-	 */
-	public void testJDIMethodsByName() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-
-			// methodsByName(String)
-			Iterator methods = type.methodsByName("run").iterator();
-			while (methods.hasNext())
-				assertTrue("1." + type.name(), methods.next() instanceof Method);
-			assertEquals("2", 0, type.methodsByName("fraz").size());
-
-			// methodsByName(String, String)
-			methods = type.methodsByName("run", "()V").iterator();
-			while (methods.hasNext())
-				assertTrue("3." + type.name(), methods.next() instanceof Method);
-			assertEquals("4", 0, type.methodsByName("fraz", "()Z").size());
-		}
-	}
-	/**
-	 * Test JDI isAbstract(), isFinal() and isStatic() 
-	 * and JDWP 'Type - Get modifiers'.
-	 */
-	public void testJDIModifiers() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			if (i != 2) {
-				// i == 2 corresponds to an ArrayType, isAbstract() is undefined
-				assertTrue("1." + i, type.isAbstract() == fIsAbstract[i]);
-			}
-			assertTrue("2." + i, type.isFinal() == fIsFinal[i]);
-			assertTrue("3." + i, type.isStatic() == fIsStatic[i]);
-		}
-	}
-	/**
-	 * Test JDI name() and JDWP 'Type - Get signature'.
-	 */
-	public void testJDIName() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			assertEquals("" + i, type.name(), fTypeName[i]);
-		}
-	}
-	/**
-	 * Test JDI nestedTypes().
-	 */
-	public void testJDINestedTypes() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = getClass("org.eclipse.debug.jdi.tests.program.OtherClass");
-		assertTrue("1." + type.name(), type != null);
-		List nestedTypes = type.nestedTypes();
-		assertEquals("2." + type.name(), 1, nestedTypes.size());
-		assertTrue("3." + type.name(), nestedTypes.get(0) instanceof ReferenceType);
-	}
-	/**
-	 * Test JDI visibleFields().
-	 */
-	public void testJDIVisibleFields() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			List all = type.allFields();
-			Iterator visible = type.visibleFields().iterator();
-			while (visible.hasNext()) {
-				Field next = (Field) visible.next();
-				assertTrue("1." + type.name() + "." + next.name(), all.contains(next));
-			}
-		}
-	}
-	/**
-	 * Test JDI visibleMethods().
-	 */
-	public void testJDIVisibleMethods() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			List all = type.allMethods();
-			Iterator visible = type.visibleMethods().iterator();
-			while (visible.hasNext()) {
-				Method next = (Method) visible.next();
-				assertTrue("1." + type.name() + "." + next.name(), all.contains(next));
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java
deleted file mode 100644
index 2184e66..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ShortValue;
-
-/**
- * Tests for JDI com.sun.jdi.ShortValue.
- */
-public class ShortValueTest extends AbstractJDITest {
-
-	private ShortValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public ShortValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get short value for 12345
-		fValue = fVM.mirrorOf((short) 12345);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ShortValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ShortValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf((short) 12345)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf((short) 54321)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals(
-			"5",
-			fValue.hashCode(),
-			fVM.mirrorOf((short) 12345).hashCode());
-		assertTrue(
-			"6",
-			fValue.hashCode() != fVM.mirrorOf((short) 54321).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", (short) 12345 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java
deleted file mode 100644
index 8338a6f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.LocalVariable;
-import com.sun.jdi.Location;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.ThreadReference;
-
-/**
- * Tests for JDI com.sun.jdi.StackFrame.
- */
-public class StackFrameTest extends AbstractJDITest {
-
-	private StackFrame fFrame;
-	/**
-	 * Creates a new test.
-	 */
-	public StackFrameTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the frame running MainClass.run()
-		fFrame = getFrame(RUN_FRAME_OFFSET);
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new StackFrameTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.StackFrame";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		StackFrame sameFrame = getFrame(RUN_FRAME_OFFSET);
-		StackFrame otherFrame = getFrame(0);
-
-		// Not identical
-		assertTrue("1", fFrame != sameFrame);
-		// But equal
-		assertTrue("2", fFrame.equals(sameFrame));
-		assertTrue("3", fFrame.hashCode() == sameFrame.hashCode());
-
-		assertTrue("4", fFrame.equals(fFrame));
-		assertTrue("5", fFrame.hashCode() == fFrame.hashCode());
-
-		assertTrue("6", !fFrame.equals(otherFrame));
-
-		assertTrue("7", !fFrame.equals(new Object()));
-		assertTrue("8", !fFrame.equals(null));
-	}
-	/**
-	 * Test JDI location().
-	 */
-	public void testJDILocation() {
-		assertTrue("1", fFrame.location() instanceof Location);
-	}
-	/**
-	 * Test JDI setValue(LocalVariable, Value), getValue(LocalVariable) and
-	 * getValues(List).
-	 */
-	public void testJDISetGetValue() {
-		// setValue
-		ThreadReference thread = (ThreadReference) fVM.allThreads().get(0);
-		LocalVariable var = getLocalVariable();
-		try {
-			fFrame.setValue(var, thread);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("1.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("1.2", false);
-		}
-
-		// getValue(LocalVariable)
-		ThreadReference value =
-			(ThreadReference) fFrame.getValue(getLocalVariable());
-		assertEquals("2", thread, value);
-
-		// getValues(List)
-		List vars = new LinkedList();
-		vars.add(var);
-		Map values = fFrame.getValues(vars);
-		value = (ThreadReference) values.get(var);
-		assertEquals("3", thread, value);
-
-		// test null value
-		var = getLocalVariable();
-		try {
-			fFrame.setValue(var, null);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("4.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("4.2", false);
-		}
-
-		value = (ThreadReference) fFrame.getValue(getLocalVariable());
-		assertEquals("5", null, value);
-
-	}
-	/**
-	 * Test JDI thisObject().
-	 */
-	public void testJDIThisObject() {
-		ObjectReference object = fFrame.thisObject();
-		ReferenceType expected = getMainClass();
-		ReferenceType referenceType = object.referenceType();
-		assertEquals("1", expected, referenceType);
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", getThread(), fFrame.thread());
-	}
-	/**
-	 * Test JDI visibleVariableByName(String).
-	 */
-	public void testJDIVisibleVariableByName() {
-		LocalVariable var = null;
-		try {
-			var = fFrame.visibleVariableByName("t");
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", getLocalVariable(), var);
-		try {
-			var = fFrame.visibleVariableByName("bogus");
-		} catch (AbsentInformationException e) {
-			assertTrue("3", false);
-		}
-		assertTrue("4", null == var);
-	}
-	/**
-	 * Test JDI visibleVariables().
-	 */
-	public void testJDIVisibleVariables() {
-		List vars = null;
-		try {
-			vars = fFrame.visibleVariables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, vars.size());
-
-		LocalVariable var;
-		int i = 0;
-		do {
-			var = (LocalVariable) vars.get(i++);
-		} while (!var.name().equals("t"));
-		assertEquals("3", getLocalVariable(), var);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java
deleted file mode 100644
index 78ea55a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for JDI com.sun.jdi.event.StepEvent.
- */
-public class StepEventTest extends AbstractJDITest {
-
-	private StepEvent fStepEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public StepEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger a step event
-		fStepEvent = triggerStepAndWait();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new StepEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.StepEvent";
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Thread", fStepEvent.thread().name());
-	}
-	/**
-	 * Test all possible steps.
-	 */
-	public void testJDIVariousSteps() {
-		ThreadReference thread = getThread();
-		triggerStepAndWait(thread, StepRequest.STEP_MIN, StepRequest.STEP_INTO);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_MIN, StepRequest.STEP_OVER);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_LINE, StepRequest.STEP_INTO);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_LINE, StepRequest.STEP_OVER);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_LINE, StepRequest.STEP_OUT);
-		waitUntilReady();
-	}
-
-	public void testJDIClassFilter1() {
-		// Request for step events
-		StepRequest request = getRequest();
-		request.addClassFilter("java.lang.NegativeArraySizeException");
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		request = getRequest();
-		request.addClassFilter("java.lang.*");
-		request.enable();
-		event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIClassFilter2() {
-		// Request for step events
-		StepRequest request = getRequest();
-		ClassType clazz = getClass("java.lang.NegativeArraySizeException");
-		request.addClassFilter(clazz);
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIClassExclusionFilter1() {
-		// Request for step events
-		StepRequest request = getRequest();
-		request.addClassExclusionFilter(
-			"org.eclipse.debug.jdi.tests.program.MainClass");
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIClassExclusionFilter2() {
-		StepRequest request = getRequest();
-		request.addClassExclusionFilter("org.eclipse.*");
-		request.addClassExclusionFilter("java.lang.*");
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			System.out.println(event.location().declaringType());
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public StepRequest getRequest() {
-		StepRequest eventRequest =
-			fVM.eventRequestManager().createStepRequest(
-				getThread(),
-				StepRequest.STEP_LINE,
-				StepRequest.STEP_OVER);
-		eventRequest.addCountFilter(1);
-		eventRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		return eventRequest;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java
deleted file mode 100644
index e245a22..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.StringReference;
-
-/**
- * Tests for JDI com.sun.jdi.StringReference
- * and JDWP String command set.
- */
-public class StringReferenceTest extends AbstractJDITest {
-
-	private StringReference fString;
-	/**
-	 * Creates a new test.
-	 */
-	public StringReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get static field "fString"
-		fString = getStringReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new StringReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.StringReference";
-	}
-	/**
-	 * Test JDI value() and JDWP 'String - Get value'.
-	 */
-	public void testJDIValue() {
-		String value = fString.value();
-		assertEquals("1", "Hello World", value);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java
deleted file mode 100644
index a00ed7f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * Run all tests
- */
-public class TestAll {
-/**
- * Returns all the test case classes (a Vector of Class) that are
- * relevant for the given VM information.
- * NB1: This doesn't include the VirtualMachineTest class.
- * NB2: The last element must be the VMDeathEventTest class since 
- *      it shuts the VM down.
- */
-protected static Vector getAllTestCases(VMInformation info) {
-	Vector classes = new Vector();
-	classes.addElement(AccessibleTest.class);
-	classes.addElement(ArrayReferenceTest.class);
-	classes.addElement(ArrayTypeTest.class);
-	classes.addElement(BooleanValueTest.class);
-	classes.addElement(BreakpointRequestTest.class);
-	classes.addElement(ByteValueTest.class);
-	classes.addElement(CharValueTest.class);
-	classes.addElement(ClassLoaderReferenceTest.class);
-	classes.addElement(ClassPrepareEventTest.class);
-	classes.addElement(ClassPrepareRequestTest.class);
-	classes.addElement(ClassTypeTest.class);
-	classes.addElement(DoubleValueTest.class);
-	classes.addElement(EventRequestManagerTest.class);
-	classes.addElement(EventRequestTest.class);
-	classes.addElement(EventTest.class);
-	classes.addElement(ExceptionEventTest.class);
-	classes.addElement(ExceptionRequestTest.class);
-	classes.addElement(FieldTest.class);
-	classes.addElement(FloatValueTest.class);
-	classes.addElement(HotCodeReplacementTest.class);
-	classes.addElement(IntegerValueTest.class);
-	classes.addElement(InterfaceTypeTest.class);
-	classes.addElement(LocalVariableTest.class);
-	classes.addElement(LocatableTest.class);
-	classes.addElement(LocationTest.class);
-	classes.addElement(LongValueTest.class);
-	classes.addElement(MethodTest.class);
-	classes.addElement(MethodEntryRequestTest.class);
-	classes.addElement(MethodExitRequestTest.class);
-	classes.addElement(MirrorTest.class);
-
-	if (info.fVM.canWatchFieldModification())
-		classes.addElement(ModificationWatchpointEventTest.class);
-		
-	classes.addElement(ObjectReferenceTest.class);
-	classes.addElement(PrimitiveValueTest.class);
-	classes.addElement(ReferenceTypeTest.class);
-	classes.addElement(ShortValueTest.class);
-	classes.addElement(StackFrameTest.class);
-	classes.addElement(StepEventTest.class);
-	classes.addElement(StringReferenceTest.class);
-	classes.addElement(ThreadDeathEventTest.class);
-	classes.addElement(ThreadGroupReferenceTest.class);
-	classes.addElement(ThreadReferenceTest.class);
-	classes.addElement(ThreadStartEventTest.class);
-	classes.addElement(TypeComponentTest.class);
-	classes.addElement(TypeTest.class);
-	classes.addElement(ValueTest.class);
-
-	if (info.fVM.canWatchFieldAccess() && info.fVM.canWatchFieldModification()) {
-		classes.addElement(WatchpointEventTest.class);
-		classes.addElement(WatchpointRequestTest.class);
-	}
-
-	classes.addElement(VirtualMachineExitTest.class);
-	classes.addElement(VMDisconnectEventTest.class);
-	classes.addElement(VMDisposeTest.class);	// note that this test does not restore the state properly.
-	return classes;
-}
-/**
- * Run all tests with the given arguments.
- * @see AbstractJDITest.parseArgs(String[]) for details on the arguments.
- */
-public static void main(String[] arguments) throws Throwable {
-	// Create test result
-	TextTestResult result= new TextTestResult();
-
-	// Run the VirtualMachineTest
-	AbstractJDITest test= run(result, VirtualMachineTest.class, arguments, null);
-
-	// Was it possible to run the first test?
-	if (test == null)
-		return;
-	
-	// Get the VM info
-	VMInformation info = test.getVMInfo();
-
-	// Get all test cases
-	Vector classes= getAllTestCases(info);
-
-	// Run the other tests
-	Enumeration enum= classes.elements();
-	while (enum.hasMoreElements()) {
-		Class testClass= (Class)enum.nextElement();
-		test= run(result, testClass, arguments, info);
-		info= test.getVMInfo(); // In case the test has changed this info
-	}
-
-	// Shut down the VM 
-	test.shutDownTarget();
-
-	// Show the result
-	result.print();
-}
-/**
- * Runs the given test with the given arguments.
- * Returns the instance that was created.
- * Returns null if there was a problem with the arguments.
- * @see AbstractJDITest(String[]) for details on the arguments.
- */
-private static AbstractJDITest run(junit.framework.TestResult result, Class testClass, String[] arguments, VMInformation info) throws Throwable {
-	// Create test
-	Class[] argTypes= {};
-	Constructor construct = null;
-	try {
-		construct = testClass.getConstructor(argTypes);
-	} catch (NoSuchMethodException e) {
-	}
-	AbstractJDITest test = null;
-	try {
-		test = (AbstractJDITest) construct.newInstance(new Object[]{});
-	} catch (InstantiationException e) {
-	} catch (IllegalAccessException e) {
-	} catch (InvocationTargetException e) {
-		throw e.getTargetException();
-	}
-	if (!test.parseArgs(arguments))
-		return null;
-	test.setVMInfo(info);
-	test.setInControl(false);
-
-	// Run test
-	System.out.println("\n" + new java.util.Date());
-	System.out.println("Begin testing " + test.getName() + "...");
-	long startTime= System.currentTimeMillis();
-	test.suite().run(result);
-	long endTime= System.currentTimeMillis();
-	long runTime= endTime-startTime;
-	System.out.println("\nTime: "+runTime/1000+"."+runTime%1000);
-	System.out.println("Done testing " + test.getName() + ".");
-	
-	return test;
-}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java
deleted file mode 100644
index efa2dbb..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.Enumeration;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-
-class TextTestResult extends TestResult {
-
-	public synchronized void addError(Test test, Throwable t) {
-		super.addError(test, t);
-		System.out.println("E");
-	}
-	public synchronized void addFailure(Test test, AssertionFailedError t) {
-		super.addFailure(test, t);
-		System.out.print("F");
-	}
-	/**
-	 * Prints failures to the standard output
-	 */
-	public synchronized void print() {
-		printHeader();
-		printErrors();
-		printFailures();
-	}
-	/**
-	 * Prints the errors to the standard output
-	 */
-	public void printErrors() {
-		if (errorCount() != 0) {
-			if (errorCount() == 1)
-				System.out.println("There was " + errorCount() + " error:");
-			else
-				System.out.println("There were " + errorCount() + " errors:");
-
-			int i = 1;
-			for (Enumeration e = errors(); e.hasMoreElements(); i++) {
-				TestFailure failure = (TestFailure) e.nextElement();
-				System.out.println(i + ") " + failure.failedTest());
-				failure.thrownException().printStackTrace();
-				System.out.println();
-			}
-		}
-	}
-	/**
-	 * Prints failures to the standard output
-	 */
-	public void printFailures() {
-		if (failureCount() != 0) {
-			if (failureCount() == 1)
-				System.out.println("There was " + failureCount() + " failure:");
-			else
-				System.out.println(
-					"There were " + failureCount() + " failures:");
-
-			int i = 1;
-			for (Enumeration e = failures(); e.hasMoreElements(); i++) {
-				TestFailure failure = (TestFailure) e.nextElement();
-				System.out.print(i + ") " + failure.failedTest());
-				Throwable t = failure.thrownException();
-				if (t.getMessage() != null)
-					System.out.println(" \"" + t.getMessage() + "\"");
-				else {
-					System.out.println();
-					failure.thrownException().printStackTrace();
-				}
-			}
-		}
-	}
-	/**
-	 * Prints the header of the report
-	 */
-	public void printHeader() {
-		if (wasSuccessful()) {
-			System.out.println();
-			System.out.print("OK");
-			System.out.println(" (" + runCount() + " tests)");
-
-		} else {
-			System.out.println();
-			System.out.println("!!!FAILURES!!!");
-			System.out.println("Test Results:");
-			System.out.println(
-				"Run: "
-					+ runCount()
-					+ " Failures: "
-					+ failureCount()
-					+ " Errors: "
-					+ errorCount());
-		}
-	}
-	public synchronized void startTest(Test test) {
-		super.startTest(test);
-		System.out.print(".");
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java
deleted file mode 100644
index 6bb1e07..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ObjectCollectedException;
-import com.sun.jdi.event.ThreadDeathEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.ThreadDeathEvent.
- */
-public class ThreadDeathEventTest extends AbstractJDITest {
-
-	private ThreadDeathEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ThreadDeathEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadDeath event)
-		fVM.resume();
-
-		// Trigger a thread end event
-		fEvent =
-			(ThreadDeathEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadDeathRequest(),
-				"ThreadDeathEvent",
-				true);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadDeathEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ThreadDeathEvent";
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		try {
-			assertEquals(
-				"1",
-				"Test Thread Death Event",
-				fEvent.thread().name());
-		} catch (ObjectCollectedException e) {
-			// Workaround known problem in Sun's VM
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java
deleted file mode 100644
index 6e4d042..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
-
-/**
- * Tests for JDI com.sun.jdi.ThreadGroupReference
- * and JDWP ThreadGroup command set.
- */
-public class ThreadGroupReferenceTest extends AbstractJDITest {
-
-	private ThreadGroupReference fThreadGroup;
-	/**
-	 * Creates a new test.
-	 */
-	public ThreadGroupReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get value of "fThread"
-		ThreadReference thread = getThread();
-
-		// Get its threadgroup
-		fThreadGroup = thread.threadGroup();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the thread group, and so the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadGroupReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ThreadGroupReference";
-	}
-	/**
-	 * Test JDI name() and JDWP 'ThreadGroup - Get name'.
-	 */
-	public void testJDIName() {
-		assertEquals("1", "Test ThreadGroup", fThreadGroup.name());
-	}
-	/**
-	 * Test JDI parent() and JDWP 'ThreadGroup - Get parent'.
-	 */
-	public void testJDIParent() {
-		assertTrue("1", fThreadGroup.parent() instanceof ThreadGroupReference);
-		ThreadGroupReference systemThreadGroup = fThreadGroup.parent();
-		assertEquals("2", "main", systemThreadGroup.name());
-		// assertTrue("3", systemThreadGroup.parent() == null);
-	}
-	/**
-	 * Test JDI suspend() and resume().
-	 */
-	public void testJDISuspendResume() {
-		fThreadGroup.suspend();
-		fThreadGroup.resume();
-	}
-	/**
-	 * Test JDI threadGroups().
-	 */
-	public void testJDIThreadGroups() {
-		List threadGroups = fThreadGroup.threadGroups();
-		assertEquals("1", 0, threadGroups.size());
-	}
-	/**
-	 * Test JDI threads() and JDWP 'ThreadGroup - Get children'.
-	 */
-	public void testJDIThreads() {
-		List threads = fThreadGroup.threads();
-		ListIterator iterator = threads.listIterator();
-		boolean isIncluded = false;
-		while (iterator.hasNext()) {
-			ThreadReference thread = (ThreadReference) iterator.next();
-			if (thread.name().equals("Test Thread")) {
-				isIncluded = true;
-				break;
-			}
-		}
-		assertTrue("1", isIncluded);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java
deleted file mode 100644
index f25704e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.List;
-
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.ThreadReference
- * and JDWP Thread command set.
- */
-public class ThreadReferenceTest extends AbstractJDITest {
-
-	private ThreadReference fThread;
-	/**
-	 * Creates a new test .
-	 */
-	public ThreadReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get thread
-		fThread = getThread();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ThreadReference";
-	}
-	/**
-	 * Test JDI currentContendedMonitor().
-	 */
-	public void testJDICurrentContendedMonitor() {
-		if (fVM.canGetCurrentContendedMonitor()) {
-			try {
-				assertTrue("1", fThread.currentContendedMonitor() == null);
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI frame(int).
-	 */
-	public void testJDIFrame() {
-		try {
-			StackFrame frame = fThread.frame(0);
-			assertTrue("1", fThread.frames().contains(frame));
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI frameCount.
-	 */
-	public void testJDIFrameCount() {
-		try {
-			int count = fThread.frameCount();
-			assertTrue("1", count <= 4);
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI frames() and JDWP 'Thread - Get frames'.
-	 */
-	public void testJDIFrames() {
-		List frames = null;
-		try {
-			frames = fThread.frames();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("1", false);
-		}
-		assertTrue("2", frames.size() > 0);
-	}
-	/**
-	 * Test JDI interrupt()().
-	 */
-	public void testJDIInterrupt() {
-		assertEquals("1", 1, fThread.suspendCount());
-		fThread.interrupt();
-		assertEquals("2", 1, fThread.suspendCount());
-	}
-	/**
-	 * Test JDI isAtBreakpoint().
-	 */
-	public void testJDIIsAtBreakpoint() {
-		assertTrue("1", !fThread.isAtBreakpoint());
-	}
-	/**
-	 * Test JDI isSuspended().
-	 */
-	public void testJDIIsSuspended() {
-		assertTrue("1", fThread.isSuspended());
-	}
-	/**
-	 * Test JDI name() and JDWP 'Thread - Get name'.
-	 */
-	public void testJDIName() {
-		assertEquals("1", "Test Thread", fThread.name());
-	}
-	/**
-	 * Test JDI ownedMonitors().
-	 */
-	public void testJDIOwnedMonitors() {
-		if (fVM.canGetOwnedMonitorInfo()) {
-			waitUntilReady();
-			try {
-				assertEquals("1", 1, fThread.ownedMonitors().size());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI status() and JDWP 'Thread - Get status'.
-	 */
-	public void testJDIStatus() {
-		int status = fThread.status();
-		assertTrue(
-			"1",
-			((status == ThreadReference.THREAD_STATUS_RUNNING)
-				|| (status == ThreadReference.THREAD_STATUS_SLEEPING)
-				|| (status == ThreadReference.THREAD_STATUS_WAIT)));
-	}
-	/**
-	 * Test JDI stop(ObjectReference).
-	 */
-	public void testJDIStop() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		// Trigger a thread start event to get a new thread
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-
-		// Create a java.lang.ThreadDeath instance in 
-		java.util.List classes = fVM.classesByName("java.lang.ThreadDeath");
-		assertTrue("1", classes.size() != 0);
-		ClassType threadDeathClass = (ClassType) classes.get(0);
-		Method constructor =
-			threadDeathClass.concreteMethodByName("<init>", "()V");
-		ObjectReference threadDeath = null;
-		try {
-			threadDeath =
-				threadDeathClass.newInstance(
-					thread,
-					constructor,
-					new java.util.LinkedList(),
-					ClassType.INVOKE_SINGLE_THREADED);
-			threadDeath.disableCollection();
-			// This object is going to be used for the lifetime of the VM.
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("3", false);
-		} catch (InvocationException e) {
-			assertTrue("4", false);
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("5", false);
-		}
-
-		// Stop the thread
-		try {
-			thread.stop(threadDeath);
-		} catch (InvalidTypeException e) {
-			assertTrue("6", false);
-		}
-
-		waitUntilReady();
-
-	}
-	/**
-	 * Test JDI suspend() and resume() 
-	 * and JDWP 'Thread - Suspend' and 'Thread - Resume'.
-	 */
-	public void testJDISuspendResume() {
-		assertEquals("1", 1, fThread.suspendCount());
-		fThread.resume();
-		assertTrue("2", !fThread.isSuspended());
-		fThread.suspend();
-		assertTrue("3", fThread.isSuspended());
-
-		waitUntilReady();
-	}
-	/**
-	 * Test JDI threadGroup() and JDWP 'Thread - Get threadGroup'.
-	 */
-	public void testJDIThreadGroup() {
-		assertTrue("1", fThread.threadGroup() instanceof ThreadGroupReference);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java
deleted file mode 100644
index c8cd575..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.ThreadStartEvent.
- */
-public class ThreadStartEventTest extends AbstractJDITest {
-
-	private ThreadStartEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ThreadStartEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		// Trigger a thread start event
-		fEvent =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				true);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadStartEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ThreadStartEvent";
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Thread Start Event", fEvent.thread().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java
deleted file mode 100644
index 992a18f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.TypeComponent;
-
-/**
- * Tests for JDI com.sun.jdi.TypeComponent.
- */
-public class TypeComponentTest extends AbstractJDITest {
-
-	private TypeComponent fField, fMethod;
-	/**
-	 * Creates a new test.
-	 */
-	public TypeComponentTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get field fObject in org.eclipse.debug.jdi.tests.program.MainClass
-		fField = getField();
-
-		// Get method print(OutputStream)
-		fMethod = getMethod();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new TypeComponentTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.TypeComponent";
-	}
-	/**
-	 * Test JDI declaringType().
-	 */
-	public void testJDIDeclaringType() {
-		ReferenceType mainClass = getMainClass();
-
-		ReferenceType declaringType = fField.declaringType();
-		assertEquals("1", mainClass, declaringType);
-
-		declaringType = fMethod.declaringType();
-		assertEquals("2", mainClass, declaringType);
-	}
-	/**
-	 * Test JDI isFinal().
-	 */
-	public void testJDIIsFinal() {
-		assertTrue("1", !fField.isFinal());
-		assertTrue("2", !fMethod.isFinal());
-	}
-	/**
-	 * Test JDI isStatic().
-	 */
-	public void testJDIIsStatic() {
-		assertTrue("1", fField.isStatic());
-		assertTrue("2", !fMethod.isStatic());
-	}
-	/**
-	 * Test JDI isSynthetic().
-	 */
-	public void testJDIIsSynthetic() {
-		if (!fVM.canGetSyntheticAttribute()) {
-			return;
-		}
-
-		assertTrue("1", !fField.isSynthetic());
-		assertTrue("2", !fMethod.isSynthetic());
-	}
-	/**
-	 * Test JDI name().
-	 */
-	public void testJDIName() {
-		assertEquals("1", "fObject", fField.name());
-		assertEquals("2", "print", fMethod.name());
-	}
-	/**
-	 * Test JDI signature().
-	 */
-	public void testJDISignature() {
-		assertEquals(
-			"1",
-			"Lorg/eclipse/debug/jdi/tests/program/MainClass;",
-			fField.signature());
-		assertEquals("2", "(Ljava/io/OutputStream;)V", fMethod.signature());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java
deleted file mode 100644
index 8519009..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.BooleanType;
-import com.sun.jdi.ByteType;
-import com.sun.jdi.CharType;
-import com.sun.jdi.DoubleType;
-import com.sun.jdi.FloatType;
-import com.sun.jdi.IntegerType;
-import com.sun.jdi.LongType;
-import com.sun.jdi.ShortType;
-import com.sun.jdi.Type;
-
-/**
- * Tests for JDI com.sun.jdi.Type.
- */
-public class TypeTest extends AbstractJDITest {
-	private Type 		
-		fArrayType,
-		fClassType,
-		fInterfaceType,
-		// primitive types
-		fShortType,
-		fByteType,
-		fIntegerType,
-		fLongType,
-		fFloatType,
-		fDoubleType,
-		fCharType,
-		fBooleanType,
-		// One-dimensional primitive arrays
-		fByteArrayType,
-		fShortArrayType,
-		fIntArrayType,
-		fLongArrayType,
-		fFloatArrayType,
-		fDoubleArrayType,
-		fCharArrayType,
-		fBooleanArrayType,
-		// Two-dimensional primitive arrays
-		fByteDoubleArrayType,
-		fShortDoubleArrayType,
-		fIntDoubleArrayType,
-		fLongDoubleArrayType,
-		fFloatDoubleArrayType,
-		fDoubleDoubleArrayType,
-		fCharDoubleArrayType,
-		fBooleanDoubleArrayType;
-		
-	/**
-	 * Creates a new test.
-	 */
-	public TypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get reference types
-		fArrayType = getArrayType();
-		fClassType = getMainClass();
-		fInterfaceType = getInterfaceType();
-		// Get primitive types
-		fBooleanType = (BooleanType) (fVM.mirrorOf(true).type());
-		fByteType = (ByteType) (fVM.mirrorOf((byte) 1).type());
-		fCharType = (CharType) (fVM.mirrorOf('a').type());
-		fDoubleType = (DoubleType) (fVM.mirrorOf(12345.6789).type());
-		fFloatType = (FloatType) (fVM.mirrorOf(12345.6789f).type());
-		fIntegerType = (IntegerType) (fVM.mirrorOf(12345).type());
-		fLongType = (LongType) (fVM.mirrorOf(123456789l).type());
-		fShortType = (ShortType) (fVM.mirrorOf((short) 12345).type());
-		// Get one-dimensional primitive arrays
-		fByteArrayType = getByteArrayType();
-		fShortArrayType = getShortArrayType();
-		fIntArrayType = getIntArrayType();
-		fLongArrayType = getLongArrayType();
-		fFloatArrayType = getFloatArrayType();
-		fDoubleArrayType = getDoubleArrayType();
-		fCharArrayType = getCharArrayType();
-		fBooleanArrayType = getBooleanArrayType();
-		//  Get two-dimensional primitive arrays
-		fByteDoubleArrayType = getByteDoubleArrayType();
-		fShortDoubleArrayType = getShortDoubleArrayType();
-		fIntDoubleArrayType = getIntDoubleArrayType();
-		fLongDoubleArrayType = getLongDoubleArrayType();
-		fFloatDoubleArrayType = getFloatDoubleArrayType();
-		fDoubleDoubleArrayType = getDoubleDoubleArrayType();
-		fCharDoubleArrayType = getCharDoubleArrayType();
-		fBooleanDoubleArrayType = getBooleanDoubleArrayType();;
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new TypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Type";
-	}
-	/**
-	 * Test JDI signature().
-	 */
-	public void testJDISignature() {
-		assertEquals("1", "[Ljava/lang/String;", fArrayType.signature());
-		assertEquals("2", "Lorg/eclipse/debug/jdi/tests/program/MainClass;", fClassType.signature());
-		assertEquals("3", "Lorg/eclipse/debug/jdi/tests/program/Printable;", fInterfaceType.signature());
-		// Primitive types
-		assertEquals("4", "S", fShortType.signature());
-		assertEquals("5", "B", fByteType.signature());
-		assertEquals("6", "I", fIntegerType.signature());
-		assertEquals("7", "J", fLongType.signature());
-		assertEquals("8", "F", fFloatType.signature());
-		assertEquals("9", "D", fDoubleType.signature());
-		assertEquals("10", "C", fCharType.signature());
-		assertEquals("11", "Z", fBooleanType.signature());
-		// One-dimensional primitive arrays
-		assertEquals("12", "[B", fByteArrayType.signature());
-		assertEquals("13", "[S", fShortArrayType.signature());
-		assertEquals("14", "[I", fIntArrayType.signature());
-		assertEquals("15", "[J", fLongArrayType.signature());
-		assertEquals("16", "[F", fFloatArrayType.signature());
-		assertEquals("17", "[D", fDoubleArrayType.signature());
-		assertEquals("18", "[C", fCharArrayType.signature());
-		assertEquals("19", "[Z", fBooleanArrayType.signature());
-		// Two-dimensional primitive arrays
-		assertEquals("20", "[[B", fByteDoubleArrayType.signature());
-		assertEquals("21", "[[S", fShortDoubleArrayType.signature());
-		assertEquals("22", "[[I", fIntDoubleArrayType.signature());
-		assertEquals("23", "[[J", fLongDoubleArrayType.signature());
-		assertEquals("24", "[[F", fFloatDoubleArrayType.signature());
-		assertEquals("25", "[[D", fDoubleDoubleArrayType.signature());
-		assertEquals("26", "[[C", fCharDoubleArrayType.signature());
-		assertEquals("27", "[[Z", fBooleanDoubleArrayType.signature());
-	}
-	/**
-	 * Test JDI typeName().
-	 */
-	public void testJDITypeName() {
-		assertEquals("1", "java.lang.String[]", fArrayType.name());
-		assertEquals("2", "org.eclipse.debug.jdi.tests.program.MainClass", fClassType.name());
-		assertEquals("3", "org.eclipse.debug.jdi.tests.program.Printable", fInterfaceType.name());
-		// Primitive types
-		assertEquals("4", "byte", fByteType.name());
-		assertEquals("5", "short", fShortType.name());
-		assertEquals("6", "int", fIntegerType.name());
-		assertEquals("7", "long", fLongType.name());
-		assertEquals("8", "float", fFloatType.name());
-		assertEquals("9", "double", fDoubleType.name());
-		assertEquals("10", "char", fCharType.name());
-		assertEquals("11", "boolean", fBooleanType.name());
-		// One-dimensional primitive arrays
-		assertEquals("12", "byte[]", fByteArrayType.name());
-		assertEquals("13", "short[]", fShortArrayType.name());
-		assertEquals("14", "int[]", fIntArrayType.name());
-		assertEquals("15", "long[]", fLongArrayType.name());
-		assertEquals("16", "float[]", fFloatArrayType.name());
-		assertEquals("17", "double[]", fDoubleArrayType.name());
-		assertEquals("18", "char[]", fCharArrayType.name());
-		assertEquals("19", "boolean[]", fBooleanArrayType.name());
-		// Two-dimensional primitive arrays
-		assertEquals("20", "byte[][]", fByteDoubleArrayType.name());
-		assertEquals("21", "short[][]", fShortDoubleArrayType.name());
-		assertEquals("22", "int[][]", fIntDoubleArrayType.name());
-		assertEquals("23", "long[][]", fLongDoubleArrayType.name());
-		assertEquals("24", "float[][]", fFloatDoubleArrayType.name());
-		assertEquals("25", "double[][]", fDoubleDoubleArrayType.name());
-		assertEquals("26", "char[][]", fCharDoubleArrayType.name());
-		assertEquals("27", "boolean[][]", fBooleanDoubleArrayType.name());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java
deleted file mode 100644
index 42eb921..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.VMDisconnectEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.VMDisconnectEvent.
- */
-public class VMDisconnectEventTest extends AbstractJDITest {
-
-	private VMDisconnectEvent fVMDisconnectEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public VMDisconnectEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Prepare to receive the event
-		VMDisconnectEventWaiter waiter =
-			new VMDisconnectEventWaiter(null, true);
-		fEventReader.addEventListener(waiter);
-
-		// Trigger a vm death event by shutting down the VM
-		killVM();
-
-		// Wait for the event to come in
-		fVMDisconnectEvent = (VMDisconnectEvent) waitForEvent(waiter, 10000);
-		// Wait 10s max
-		fEventReader.removeEventListener(waiter);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Finish the shut down
-		shutDownTarget();
-
-		// Start up again
-		launchTargetAndStartProgram();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new VMDisconnectEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.VMDeathEvent";
-	}
-	/**
-	 * Test that we received the event.
-	 */
-	public void testJDIVMDeath() {
-		assertTrue("1", fVMDisconnectEvent != null);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java
deleted file mode 100644
index 6384f8b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.event.VMDisconnectEvent;
-/**
- * Listen for VMDisconnectEvent.
- */
-public class VMDisconnectEventWaiter extends EventWaiter {
-	/**
-	 * Creates a VMDisconnectEventWaiter.
-	 */
-	public VMDisconnectEventWaiter(
-		com.sun.jdi.request.EventRequest request,
-		boolean shouldGo) {
-		super(request, shouldGo);
-	}
-	public boolean vmDisconnect(VMDisconnectEvent event) {
-		notifyEvent(event);
-		return fShouldGo;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java
deleted file mode 100644
index d6cc021..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.VMDisconnectedException;
-
-/**
- * Tests for JDI com.sun.jdi.event.VMDisconnectEvent.
- */
-public class VMDisposeTest extends AbstractJDITest {
-	/**
-	 * Creates a new test.
-	 */
-	public VMDisposeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new VMDisposeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine.dispose";
-	}
-	/**
-	 * Test that we received the event.
-	 */
-	public void testJDIVMDispose() {
-		fVM.dispose();
-		try {
-			fVM.allThreads();
-			assertTrue("1", false);
-		} catch (VMDisconnectedException e) {
-		}
-
-		try {
-			// Reconnect to running VM.
-			connectToVM();
-			fVM.allThreads();
-		} catch (VMDisconnectedException e) {
-			assertTrue("3", false);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java
deleted file mode 100644
index 56eba84..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.VirtualMachine;
-
-/**
- * This class allows to hold on information about the VM
- * that we don't want to loose between 2 tests.
- */
-public class VMInformation {
-	VirtualMachine fVM;
-	Process fLaunchedVM;
-	EventReader fEventReader;
-	AbstractReader fConsoleReader;
-	String fVMType;
-
-	/** 
-	 * Creates a new VMInformation for the given vm, vm type, launched vm, event reader and console reader.
-	 */
-	VMInformation(VirtualMachine vm, String vmType, Process launchedVM, EventReader eventReader, AbstractReader consoleReader) {
-		fVM = vm;
-		fLaunchedVM = launchedVM;
-		fEventReader = eventReader;
-		fConsoleReader = consoleReader;
-		fVMType = vmType;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java
deleted file mode 100644
index 5f9990a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.Value;
-
-/**
- * Tests for JDI com.sun.jdi.Value.
- */
-public class ValueTest extends AbstractJDITest {
-	private Value fBoolean,
-		fByte,
-		fChar,
-		fDouble,
-		fFloat,
-		fInteger,
-		fLong,
-		fShort,
-		fArray,
-		fObject;
-	/**
-	 * Creates a new test.
-	 */
-	public ValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get primitive values
-		fBoolean = fVM.mirrorOf(true);
-		fByte = fVM.mirrorOf((byte) 1);
-		fChar = fVM.mirrorOf('a');
-		fDouble = fVM.mirrorOf(12345.6789);
-		fFloat = fVM.mirrorOf(12345.6789f);
-		fInteger = fVM.mirrorOf(12345);
-		fLong = fVM.mirrorOf(123456789l);
-		fShort = fVM.mirrorOf((short) 12345);
-
-		// Get object references
-		fArray = getObjectArrayReference();
-		fObject = getObjectReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Value";
-	}
-	/**
-	 * Test JDI type().
-	 */
-	public void testJDIType() {
-		assertEquals("1", "boolean", fBoolean.type().name());
-		assertEquals("2", "byte", fByte.type().name());
-		assertEquals("3", "char", fChar.type().name());
-		assertEquals("4", "double", fDouble.type().name());
-		assertEquals("5", "float", fFloat.type().name());
-		assertEquals("6", "int", fInteger.type().name());
-		assertEquals("7", "long", fLong.type().name());
-		assertEquals("8", "short", fShort.type().name());
-		assertEquals("9", "java.lang.String[]", fArray.type().name());
-		assertEquals(
-			"10",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			fObject.type().name());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java
deleted file mode 100644
index 976a6a8..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.VMDisconnectedException;
-
-/**
- * Tests for JDI com.sun.jdi.VirtualMachine.exit().
- */
-public class VirtualMachineExitTest extends AbstractJDITest {
-	/**
-	 * Creates a new test .
-	 */
-	public VirtualMachineExitTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Finish the shut down
-		shutDownTarget();
-
-		// Start up again
-		launchTargetAndStartProgram();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(String[] args) {
-		new VirtualMachineExitTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine.exit(int)";
-	}
-	/**
-	 * Test JDI exit().
-	 */
-	public void testJDIExit() {
-		try {
-			fVM.exit(0);
-		} catch (VMDisconnectedException e) {
-			assertTrue("1", false);
-		}
-
-		try {
-			Thread.sleep(200);
-			assertTrue("2", !vmIsRunning());
-			fVM.allThreads();
-			assertTrue("3", false);
-		} catch (VMDisconnectedException e) {
-		} catch (InterruptedException e) {
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java
deleted file mode 100644
index 5627cac..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java
+++ /dev/null
@@ -1,422 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Vector;
-
-import junit.framework.Test;
-
-import com.sun.jdi.BooleanValue;
-import com.sun.jdi.ByteValue;
-import com.sun.jdi.CharValue;
-import com.sun.jdi.DoubleValue;
-import com.sun.jdi.FloatValue;
-import com.sun.jdi.IntegerValue;
-import com.sun.jdi.LongValue;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ShortValue;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.EventQueue;
-import com.sun.jdi.request.EventRequestManager;
-
-/**
- * Tests for JDI com.sun.jdi.VirtualMachine
- * and JDWP VM command set.
- * 
- * Example of arguments:
- *   -launcher SunVMLauncher -address c:\jdk1.2.2\ -classpath d:\target
- */
-public class VirtualMachineTest extends AbstractJDITest {
-
-	/**
-	 * Creates a new test .
-	 */
-	public VirtualMachineTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new VirtualMachineTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine";
-	}
-	/**
-	 * Don't start the program yet, so that the testNotStarted* tests can run before.
-	 */
-	protected void setUp() {
-		launchTargetAndConnectToVM();
-	}
-	/**
-	 * Starts the target program.
-	 * NB: This method is copied in this class only so that it can be invoked
-	 *     dynamically.
-	 */
-	public void startProgram() {
-		super.startProgram();
-	}
-	/**
-	 * Returns all tests 
-	 */
-	protected Test suite() {
-		JDITestSuite suite = new JDITestSuite(this);
-
-		// Tests that run before the program is started
-		Vector testNames = getAllMatchingTests("testNotStarted");
-		Iterator iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-
-		// The method that starts the program
-		suite.addTest(new JDITestCase(this, "startProgram"));
-
-		// Tests that run after the program has started
-		testNames = getAllMatchingTests("testStarted");
-		iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-
-		// All other tests
-		testNames = getAllMatchingTests("testJDI");
-		iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-
-		return suite;
-	}
-	/**
-	 * Test JDI canGetBytecodes().
-	 */
-	public void testJDICanGetBytecodes() {
-		fVM.canGetBytecodes();
-	}
-	/**
-	 * Test JDI canGetCurrentContendedMonitor().
-	 */
-	public void testJDICanGetCurrentContendedMonitor() {
-		fVM.canGetCurrentContendedMonitor();
-	}
-	/**
-	 * Test JDI canGetMonitorInfo().
-	 */
-	public void testJDICanGetMonitorInfo() {
-		fVM.canGetMonitorInfo();
-	}
-	/**
-	 * Test JDI canGetOwnedMonitorInfo().
-	 */
-	public void testJDICanGetOwnedMonitorInfo() {
-		fVM.canGetOwnedMonitorInfo();
-	}
-	/**
-	 * Test JDI canGetSyntheticAttribute().
-	 */
-	public void testJDICanGetSyntheticAttribute() {
-		//  This is optional functionality, thus this is not a failure
-		fVM.canGetSyntheticAttribute();
-	}
-	/**
-	 * Test JDI canWatchFieldAccess().
-	 */
-	public void testJDICanWatchFieldAccess() {
-		//  This is optional functionality, thus this is not a failure
-		fVM.canWatchFieldAccess();
-	}
-	/**
-	 * Test JDI canWatchFieldModification().
-	 */
-	public void testJDICanWatchFieldModification() {
-		//  This is optional functionality, thus this is not a failure
-		fVM.canWatchFieldModification();
-	}
-	/**
-	 * Test JDI eventQueue().
-	 */
-	public void testJDIEventQueue() {
-		assertTrue("1", fVM.eventQueue() instanceof EventQueue);
-	}
-	/**
-	 * Test JDI eventRequestManager().
-	 */
-	public void testJDIEventRequestManager() {
-		assertTrue("1", fVM.eventRequestManager() instanceof EventRequestManager);
-	}
-	/**
-	 * Test JDI mirrorOf(boolean).
-	 */
-	public void testJDIMirrorOfBoolean() {
-		boolean value = true;
-		BooleanValue mirror = fVM.mirrorOf(value);
-		assertTrue("1", value == mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(byte).
-	 */
-	public void testJDIMirrorOfByte() {
-		byte value = 1;
-		ByteValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(char).
-	 */
-	public void testJDIMirrorOfChar() {
-		char value = 'a';
-		CharValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(double).
-	 */
-	public void testJDIMirrorOfDouble() {
-		double value = 12345.6789;
-		DoubleValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value(), 0);
-	}
-	/**
-	 * Test JDI mirrorOf(float).
-	 */
-	public void testJDIMirrorOfFloat() {
-		float value = 12345.6789f;
-		FloatValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value(), 0);
-	}
-	/**
-	 * Test JDI mirrorOf(int).
-	 */
-	public void testJDIMirrorOfInt() {
-		int value = 12345;
-		IntegerValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(long).
-	 */
-	public void testJDIMirrorOfLong() {
-		long value = 1234567890l;
-		LongValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(short).
-	 */
-	public void testJDIMirrorOfShort() {
-		short value = (short) 12345;
-		ShortValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(String) and JDWP 'VM - Create String'.
-	 */
-	public void testJDIMirrorOfString() {
-		String testString = "Test";
-		StringReference newString = null;
-		newString = fVM.mirrorOf(testString);
-		assertEquals("1", newString.value(), testString);
-	}
-	/**
-	 * Test JDI setDebugTraceMode(int).
-	 */
-	public void testJDISetDebugTraceMode() {
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_ALL);
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_SENDS);
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_RECEIVES);
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_NONE);
-
-		// restore original value
-		fVM.setDebugTraceMode(fVMTraceFlags);
-	}
-	/**
-	 * Test JDI getVersion().
-	 */
-	public void testJDIVersion() {
-		String version = fVM.version();
-		assertTrue("1", version != null);
-	}
-	/**
-	 * Test JDI allClasses() and JDWP 'VM - Get all classes'
-	 * while the test program has not been started.
-	 */
-	public void testNotStartedAllClasses() {
-		List classes = fVM.allClasses();
-		Iterator iterator = classes.listIterator();
-		int i = 0;
-		while (iterator.hasNext())
-			assertTrue(Integer.toString(i++), iterator.next() instanceof ReferenceType);
-	}
-	/**
-	 * Test JDI allThreads() and JDWP 'VM - Get all threads'
-	 * while the test program has not been started.
-	 */
-	public void testNotStartedAllThreads() {
-		List threads = fVM.allThreads();
-		Iterator iterator = threads.listIterator();
-		int i = 0;
-		while (iterator.hasNext())
-			assertTrue(Integer.toString(i++), iterator.next() instanceof ThreadReference);
-	}
-	/**
-	 * Test JDI classesByName() while the test program has not been started.
-	 */
-	public void testNotStartedClassesByName() {
-		List classes = fVM.classesByName("java.lang.Object");
-		assertEquals("1", 1, classes.size());
-	}
-	/**
-	 * Test JDI allClasses() and JDWP 'VM- Get all classes'
-	 * once the test program has been started.
-	 */
-	public void testStartedAllClasses() {
-
-		// The test program has started, the number of classes is != 0
-		List classes = fVM.allClasses();
-		assertTrue("1", classes.size() != 0);
-
-		// Collect names of received classes
-		String[] names = new String[classes.size()];
-		ListIterator iterator = classes.listIterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			names[i++] = type.name();
-		}
-
-		// Check that they are the expected names
-		String[] expected =
-			new String[] {
-				"java.lang.Object",
-				"java.util.Date",
-				"org.eclipse.debug.jdi.tests.program.Printable",
-				"org.eclipse.debug.jdi.tests.program.MainClass" };
-		for (int j = 0; j < expected.length; j++) {
-			boolean isIncluded = false;
-			iteration : for (int k = 0; k < names.length; k++) {
-				if (names[k].equals(expected[j])) {
-					isIncluded = true;
-					break iteration;
-				}
-			}
-			assertTrue("2." + j, isIncluded);
-		}
-	}
-	/**
-	 * Test JDI allThreads() and JDWP 'VM - Get all threads'
-	 * once the test program has been started.
-	 */
-	public void testStartedAllThreads() {
-
-		// The test program has started, the number of threads is != 0
-		List threads = fVM.allThreads();
-		assertTrue("1", threads.size() != 0);
-
-		// Collect names of received threads
-		String[] names = new String[threads.size()];
-		ListIterator iterator = threads.listIterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			ThreadReference thread = (ThreadReference) iterator.next();
-			names[i++] = thread.name();
-		}
-
-		// Check that they contain at least the expected names
-		String[] expected = new String[] { "Test Thread" };
-		boolean isIncluded = false;
-		iteration : for (int j = 0; j < expected.length; j++) {
-			for (int k = 0; k < names.length; k++) {
-				if (expected[j].equals(names[k])) {
-					isIncluded = true;
-					break iteration;
-				}
-			}
-		}
-		assertTrue("2", isIncluded);
-	}
-	/**
-	 * Test JDI classesByName() once the test program has been started.
-	 */
-	public void testStartedClassesByName() {
-
-		// The test program has started, the number of java.lang.Object is 1
-		List classes = fVM.classesByName("java.lang.Object");
-		assertEquals("1", classes.size(), 1);
-
-		// Collect names of received classes
-		String[] names = new String[classes.size()];
-		ListIterator iterator = classes.listIterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			names[i++] = type.name();
-		}
-
-		// Check that they are all "java.lang.Object"
-		for (int j = 0; j < names.length; j++) {
-			assertEquals("2." + j, "java.lang.Object", names[j]);
-		}
-	}
-	/**
-	 * Test JDI suspend() and resume() once the test program has been started.
-	 */
-	public void testStartedSuspendResume() {
-		// Suspend
-		fVM.suspend();
-		ListIterator threads = fVM.allThreads().listIterator();
-		while (threads.hasNext()) {
-			ThreadReference thread = (ThreadReference) threads.next();
-			assertTrue("1." + thread.name(), thread.isSuspended());
-		}
-
-		// Resume
-		fVM.resume();
-		// Cannot assertTrue that all threads are not suspended because they might have been suspended
-		// by the program itself
-
-		// Suspend VM and suspend one thread
-		fVM.suspend();
-		threads = fVM.allThreads().listIterator();
-		ThreadReference suspended = getThread();
-		suspended.suspend();
-		while (threads.hasNext()) {
-			ThreadReference thread = (ThreadReference) threads.next();
-			assertTrue("2." + thread.name(), thread.isSuspended());
-		}
-
-		// Resume VM and ensure that the one thread that was suspended is still suspended
-		fVM.resume();
-		assertTrue("3", suspended.isSuspended());
-	}
-	/**
-	 * Test JDI topLevelThreadGroups().
-	 */
-	public void testStartedTopLevelThreadGroups() {
-		List topLevelThreadGroups = fVM.topLevelThreadGroups();
-		assertEquals("1", 1, topLevelThreadGroups.size());
-		assertTrue("2", topLevelThreadGroups.get(0) instanceof ThreadGroupReference);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java
deleted file mode 100644
index 51eb536..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.ArrayList;
-
-import com.sun.jdi.BooleanValue;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.WatchpointEvent;
-import com.sun.jdi.request.EventRequestManager;
-
-/**
- * Tests for JDI com.sun.jdi.event.WatchpointEvent.
- */
-public class WatchpointEventTest extends AbstractJDITest {
-
-	private WatchpointEvent fAccessWatchpointEvent,
-		fStaticAccessWatchpointEvent,
-		fModificationWatchpointEvent;
-	// NB: Static modification watchpoint event is tested in ModificationWatchpointTest
-	/**
-	 * Creates a new test.
-	 */
-	public WatchpointEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger an access watchpoint event
-		fAccessWatchpointEvent =
-			(AccessWatchpointEvent) triggerAndWait(getAccessWatchpointRequest(),
-				"AccessWatchpointEvent",
-				true);
-		assertTrue("Got access watchpoint event", fAccessWatchpointEvent != null);
-
-		// Trigger a static access watchpoint event
-		fStaticAccessWatchpointEvent =
-			(AccessWatchpointEvent) triggerAndWait(
-				getStaticAccessWatchpointRequest(),
-				"StaticAccessWatchpointEvent",
-				true);
-		assertTrue(
-			"Got static access watchpoint event",
-			fStaticAccessWatchpointEvent != null);
-
-		// Trigger a modification watchpoint event
-		fModificationWatchpointEvent =
-			(ModificationWatchpointEvent) triggerAndWait(
-				getModificationWatchpointRequest(),
-				"ModificationWatchpointEvent",
-				false);
-		// Interrupt the VM so that we can test valueCurrent()
-		assertTrue(
-			"Got modification watchpoint event",
-			fModificationWatchpointEvent != null);
-
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fBool" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Delete the event requests we created in this test
-		EventRequestManager requestManager = fVM.eventRequestManager();
-		requestManager.deleteEventRequests(
-			new ArrayList(requestManager.accessWatchpointRequests()));
-		requestManager.deleteEventRequests(
-			new ArrayList(requestManager.modificationWatchpointRequests()));
-
-		// Set the value of the "fBool" field back to its original value
-		resetField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new WatchpointEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.WatchpointEvent";
-	}
-	/**
-	 * Test JDI field().
-	 */
-	public void testJDIField() {
-		assertEquals("1", getField("fBool"), fAccessWatchpointEvent.field());
-		assertEquals(
-			"2",
-			getField("fString"),
-			fStaticAccessWatchpointEvent.field());
-		assertEquals(
-			"3",
-			getField("fBool"),
-			fModificationWatchpointEvent.field());
-	}
-	/**
-	 * Test JDI object().
-	 */
-	public void testJDIObject() {
-		assertEquals(
-			"1",
-			getObjectReference(),
-			fAccessWatchpointEvent.object());
-		assertTrue("2", fStaticAccessWatchpointEvent.object() == null);
-		assertEquals(
-			"3",
-			getObjectReference(),
-			fModificationWatchpointEvent.object());
-	}
-	/**
-	 * Test JDI valueCurrent().
-	 */
-	public void testJDIValueCurrent() {
-		assertTrue(
-			"1",
-			false
-				== ((BooleanValue) fAccessWatchpointEvent.valueCurrent()).value());
-
-		assertEquals(
-			"2",
-			"Hello World",
-			((StringReference) fStaticAccessWatchpointEvent.valueCurrent())
-				.value());
-
-		assertTrue(
-			"3",
-			false
-				== ((BooleanValue) fModificationWatchpointEvent.valueCurrent())
-					.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java
deleted file mode 100644
index 7e013a9..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.debug.jdi.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import com.sun.jdi.request.WatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.WatchpointRequest.
- */
-public class WatchpointRequestTest extends AbstractJDITest {
-
-	private WatchpointRequest fAccessWatchpointRequest,
-		fModificationWatchpointRequest;
-	/**
-	 * Creates a new test .
-	 */
-	public WatchpointRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get an acces watchpoint request
-		fAccessWatchpointRequest = getAccessWatchpointRequest();
-
-		// Get a modification watchpoint request
-		fModificationWatchpointRequest = getModificationWatchpointRequest();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the watchpoint requests we created in this test
-		fVM.eventRequestManager().deleteEventRequest(fAccessWatchpointRequest);
-		fVM.eventRequestManager().deleteEventRequest(
-			fModificationWatchpointRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new WatchpointRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.WatchpointRequest";
-	}
-	/**
-	 * Test JDI field().
-	 */
-	public void testJDIField() {
-		assertEquals("1", getField("fBool"), fAccessWatchpointRequest.field());
-		assertEquals(
-			"2",
-			getField("fBool"),
-			fModificationWatchpointRequest.field());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
deleted file mode 100644
index ae7d107..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
+++ /dev/null
@@ -1,321 +0,0 @@
-package org.eclipse.debug.jdi.tests.program;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
- 
-/**
- * Main class for target VM tests.
- * This class is intended to be run by the target VM. 
- * It will use other classes in this package, and it will create and terminate
- * threads as a regular program would do.
- *
- * WARNING, WARNING:
- * Tests in org.eclipse.debug.jdi.tests assume the content of this class, 
- * as well as its behavior. So if this class or one of the types in this
- * package is changed, the corresponding tests must also be changed.
- */
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Date;
-
-public class MainClass extends Date implements Runnable, Printable {
-
-	private static byte[] byteArray = new byte[0];
-	private static byte[][] byteDoubleArray = new byte[0][0];
-	private static short[] shortArray = new short[0];
-	private static short[][] shortDoubleArray = new short[0][0];
-	private static int[] intArray = new int[0];
-	private static int[][] intDoubleArray = new int[0][0];
-	private static long[] longArray = new long[0];
-	private static long[][] longDoubleArray = new long[0][0];
-	private static double[] doubleArray = new double[0];
-	private static double[][] doubleDoubleArray = new double[0][0];
-	private static float[] floatArray = new float[0];
-	private static float[][] floatDoubleArray = new float[0][0];
-	private static char[] charArray = new char[0];
-	private static char[][] charDoubleArray = new char[0][0];
-	private static boolean[] booleanArray = new boolean[0];
-	private static boolean[][] booleanDoubleArray = new boolean[0][0];
-
-	private String string = "";
-	private String[] stringArray = new String[0];
-	private String[][] stringDoubleArray = new String[0][0];
-
-	public static int fInt = 0;
-
-	public static MainClass fObject = new MainClass();
-
-	public static String fString = "Hello World";
-
-	public static Thread fThread;
-
-	public static Thread fMainThread;
-
-	public static String[] fArray = new String[] { "foo", "bar", "hop" };
-
-	public static double[] fDoubleArray = new double[] { 1, 2.2, 3.33 };
-
-	public static String fEventType = "";
-
-	public boolean fBool = false;
-
-	private char fChar = 'a';
-
-	private String fString2 = "Hello";
-
-	protected final String fString3 = "HEY";
-
-	public MainClass() {
-	}
-
-	/* Used to test ClassType.newInstance */
-	public MainClass(int i, Object o1, Object o2) {
-	}
-
-	/* For invocation tests */
-	private static String invoke1(int x, Object o) {
-		if (o == null)
-			return (new Integer(x)).toString();
-		else
-			return "";
-	}
-	/* For invocation tests */
-	private static void invoke2() {
-		throw new IndexOutOfBoundsException();
-	}
-	/* For invocation tests */
-	private int invoke3(String str, Object o) {
-		return Integer.parseInt(str);
-	}
-	/* For invocation tests */
-	private long invoke4() throws java.io.EOFException {
-		throw new java.io.EOFException();
-	}
-	/* For variables test */
-	private void variablesTest(long l) {
-	}
-	public static void main(java.lang.String[] args) {
-		// Start the test program
-		ThreadGroup group = new ThreadGroup("Test ThreadGroup");
-		fThread = new Thread(group, fObject, "Test Thread");
-		fThread.start();
-
-		fMainThread = Thread.currentThread();
-
-		// Prevent this thread from dying
-		while (true)
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-	}
-	public void print(OutputStream out) {
-		String string = fInt++ +". " + fString;
-		PrintWriter writer = new PrintWriter(out);
-		writer.println(string);
-		writer.flush();
-	}
-	synchronized public void printAndSignal() {
-		print(System.out);
-
-		// Signal readiness by throwing an exception
-		try {
-			throw new NegativeArraySizeException();
-		} catch (NegativeArraySizeException exc) {
-		}
-	}
-	public void run() {
-		try {
-			Thread t = Thread.currentThread();
-			MainClass o = new OtherClass();
-			// The front-end tests use the class load event to determine that the program has started
-
-			if (CONSTANT == 2)
-				System.out.println("CONSTANT=2");
-
-			while (true) {
-				printAndSignal();
-				triggerEvent();
-				useLocalVars(t, o);
-				try {
-					Thread.sleep(1000);
-				} catch (InterruptedException e) {
-				}
-			}
-		} finally {
-			System.out.println("Running finally block in MainClass.run()");
-		}
-	}
-	/**
-	 *	Trigger an access watchpoint event for the front-end.
-	 */
-	private void triggerAccessWatchpointEvent() {
-		if (fBool)
-			System.out.println("fBool is true");
-	}
-	/**
-	 *	Trigger a breakpoint event for the front-end.
-	 */
-	private void triggerBreakpointEvent() {
-		System.out.println("Breakpoint");
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent() {
-		new TestClass();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent1() {
-		new TestClass1();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent2() {
-		new TestClass2();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent3() {
-		new TestClass3();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent4() {
-		new TestClass4();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent5() {
-		new TestClass5();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent6() {
-		new TestClass6();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent7() {
-		new TestClass7();
-		new TestClazz8();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent8() {
-		new TestClazz9();
-		new TestClazz10();
-	}
-	/**
-	 *	Trigger an event for the front-end.
-	 */
-	private void triggerEvent() {
-		/* Ensure we do it only once */
-		String eventType = fEventType;
-		fEventType = "";
-
-		/* Trigger event according to the field fEventType */
-		if (eventType.equals(""))
-			return;
-		else if (eventType.equals("AccessWatchpointEvent"))
-			triggerAccessWatchpointEvent();
-		else if (eventType.equals("StaticAccessWatchpointEvent"))
-			triggerStaticAccessWatchpointEvent();
-		else if (eventType.equals("BreakpointEvent"))
-			triggerBreakpointEvent();
-		else if (eventType.equals("ClassPrepareEvent"))
-			triggerClassPrepareEvent();
-		else if (eventType.equals("ClassPrepareEvent1"))
-			triggerClassPrepareEvent1();
-		else if (eventType.equals("ClassPrepareEvent2"))
-			triggerClassPrepareEvent2();
-		else if (eventType.equals("ClassPrepareEvent3"))
-			triggerClassPrepareEvent3();
-		else if (eventType.equals("ClassPrepareEvent4"))
-			triggerClassPrepareEvent4();
-		else if (eventType.equals("ClassPrepareEvent5"))
-			triggerClassPrepareEvent5();
-		else if (eventType.equals("ClassPrepareEvent6"))
-			triggerClassPrepareEvent6();
-		else if (eventType.equals("ClassPrepareEvent7"))
-			triggerClassPrepareEvent7();
-		else if (eventType.equals("ClassPrepareEvent8"))
-			triggerClassPrepareEvent8();
-		else if (eventType.equals("ExceptionEvent"))
-			triggerExceptionEvent();
-		else if (eventType.equals("ModificationWatchpointEvent"))
-			triggerModificationWatchpointEvent();
-		else if (eventType.equals("StaticModificationWatchpointEvent"))
-			triggerStaticModificationWatchpointEvent();
-		else if (eventType.equals("ThreadStartEvent"))
-			triggerThreadStartEvent();
-		else if (eventType.equals("ThreadDeathEvent"))
-			triggerThreadDeathEvent();
-		else
-			System.out.println("Unknown event type: " + eventType);
-	}
-	/**
-	 *	Trigger an exception event for the front-end.
-	 */
-	private void triggerExceptionEvent() {
-		Thread t = new Thread(new Runnable() {
-			public void run() {
-				throw new Error();
-			}
-		}, "Test Exception Event");
-		t.start();
-	}
-	/**
-	 *	Trigger a modification watchpoint event for the front-end.
-	 */
-	private void triggerModificationWatchpointEvent() {
-		fBool = true;
-	}
-	/**
-	 * Trigger an access watchpoint event to a static field
-	 * for the front-end.
-	 */
-	private void triggerStaticAccessWatchpointEvent() {
-		if (fObject == null)
-			System.out.println("fObject is null");
-	}
-	/**
-	 * Trigger a modification watchpoint event of a static field
-	 * for the front-end.
-	 */
-	private void triggerStaticModificationWatchpointEvent() {
-		fString = "Hello Universe";
-	}
-	/**
-	 *	Trigger a thread end event for the front-end.
-	 */
-	private void triggerThreadDeathEvent() {
-		new Thread("Test Thread Death Event").start();
-	}
-	/**
-	 *	Trigger a thread start event for the front-end.
-	 */
-	private void triggerThreadStartEvent() {
-		new Thread("Test Thread Start Event").start();
-	}
-	private void useLocalVars(Thread t, MainClass o) {
-		if (t == null)
-			System.out.println("t is null");
-		if (o == null)
-			System.out.println("o is null");
-
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java
deleted file mode 100644
index bd1b750..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.debug.jdi.tests.program;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-public class OtherClass extends MainClass {
-	class InnerClass {
-	}
-	InnerClass fInner = new InnerClass();
-	/**
-	 * OtherClass constructor comment.
-	 */
-	public OtherClass() {
-		super();
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java
deleted file mode 100644
index b31261e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.debug.jdi.tests.program;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-/**
- * Interface type for target VM tests.
- * This interface is intended to be loaded by the target VM. 
- *
- * WARNING, WARNING:
- * Tests in org.eclipse.debug.jdi.tests assume the content of this interface.
- * So if this interface or one of the types in this
- * package is changed, the corresponding tests must also be changed.
- */
-
-import java.io.OutputStream;
-
-public interface Printable extends Cloneable {
-	int CONSTANT = 1;
-public void print(OutputStream out);
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java
deleted file mode 100644
index bbe205f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java
deleted file mode 100644
index 560143a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java
deleted file mode 100644
index 8b61cce..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java
deleted file mode 100644
index f0f50f7..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java
deleted file mode 100644
index 7ccef59..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java
deleted file mode 100644
index ddba5d1..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java
deleted file mode 100644
index e638623..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java
deleted file mode 100644
index dc940f2..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java
deleted file mode 100644
index abd8b35..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java
deleted file mode 100644
index 491cc7d..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java
deleted file mode 100644
index 44387d9..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/.classpath b/org.eclipse.jdt.debug.tests/.classpath
deleted file mode 100644
index 2c7f166..0000000
--- a/org.eclipse.jdt.debug.tests/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="test plugin/"/>
-    <classpathentry kind="src" path="tests/"/>
-	<classpathentry kind="src" path="testprograms"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.launching"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.debug.tests/.cvsignore b/org.eclipse.jdt.debug.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.jdt.debug.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/.plugins-path b/org.eclipse.jdt.debug.tests/.plugins-path
deleted file mode 100644
index 36f1716..0000000
--- a/org.eclipse.jdt.debug.tests/.plugins-path
+++ /dev/null
@@ -1 +0,0 @@
-platformPath = file:/d:/workspaces/eclipse-sh1/plugins/
diff --git a/org.eclipse.jdt.debug.tests/.project b/org.eclipse.jdt.debug.tests/.project
deleted file mode 100644
index f60245c..0000000
--- a/org.eclipse.jdt.debug.tests/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.debug.tests</name>
-	<comment></comment>
-	<projects>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug</project>
-		<project>org.eclipse.jdt.debug.ui</project>
-		<project>org.eclipse.jdt.junit.eclipse</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.update.core</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.debug.tests/about.html b/org.eclipse.jdt.debug.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.debug.tests/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/build.properties b/org.eclipse.jdt.debug.tests/build.properties
deleted file mode 100644
index 0179dfd..0000000
--- a/org.eclipse.jdt.debug.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               testresources/,\
-               testjars/,\
-               testprograms/,\
-               *.jar
-source.javadebugtests.jar = test plugin/,\
-                         tests/
diff --git a/org.eclipse.jdt.debug.tests/plugin.properties b/org.eclipse.jdt.debug.tests/plugin.properties
deleted file mode 100644
index 8d388a7..0000000
--- a/org.eclipse.jdt.debug.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
-# Contributors:
-#    IBM Corporation - Initial implementation
-######################################################################
-
-pluginName=Java Debug Test Plugin
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/plugin.xml b/org.eclipse.jdt.debug.tests/plugin.xml
deleted file mode 100644
index a6dffa0..0000000
--- a/org.eclipse.jdt.debug.tests/plugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<plugin
-   id="org.eclipse.jdt.debug.tests"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.debug.testplugin.JavaTestPlugin">
-   
-   <requires>
-	  <import plugin="org.junit"/>   
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-	  <import plugin="org.eclipse.jdt.launching"/>
-	  <import plugin="org.eclipse.jdt.debug"/>
-	  <import plugin="org.eclipse.jdt.debug.ui"/>
-	  <import plugin="org.eclipse.debug.core"/>
-	  <import plugin="org.eclipse.debug.ui"/>
-	  <import plugin="org.eclipse.update.core"/>
-   </requires>
-
-<runtime>
-  <library name="javadebugtests.jar" >
-     <export name = "*"/>
-  </library> 
-</runtime>
-
-<extension id="app" point="org.eclipse.core.runtime.applications">
-  <application> 
-     <run class="org.eclipse.jdt.debug.testplugin.TestWorkbench">
-		<parameter name="productInfo" value="product.ini"/>
-     </run>
-  </application>
-</extension>
-
-<extension point="org.eclipse.jdt.launching.classpathProviders">
-  <classpathProvider
-    id = "org.eclipse.jdt.debug.tests.EmptyClasspathProvider"
-    class ="org.eclipse.jdt.debug.testplugin.EmptyClasspathProvider">
-  </classpathProvider>
-</extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.debug.tests/scripts/exportplugin.xml b/org.eclipse.jdt.debug.tests/scripts/exportplugin.xml
deleted file mode 100644
index e049940..0000000
--- a/org.eclipse.jdt.debug.tests/scripts/exportplugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- Export a jar of .class files for the org.eclipse.jdt.debug.test Eclipse plugin
-     along with other important plugin files to the "plugin-export" subdirectory
-     of the target Eclipse installation -->
-<project name="org.eclipse.jdt.debug.tests" default="export" basedir="..">
-
-	<!-- Set the timestamp and important properties -->
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="dest"  value="${destdir}/org.eclipse.jdt.debug.tests" />
-	</target>
-
-	<!-- Create the jar of .class files, and copy other important files to export dir -->
-	<target name="export" depends="init">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		
-		<!-- Create the java debug tests jar -->
-		<jar 
-			jarfile="${dest}/javadebugtests.jar"
-			basedir="bin"
-			includes="org/**"
-		/>
-				
-		<!-- Create the source zip -->
-		<zip zipfile="${dest}/javadebugtestssrc.zip">
-			<fileset dir="test plugin"/>
-			<fileset dir="tests"/>
-		</zip>
-		
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file=".classpath" todir="${dest}"/>
-		<copy file="test.xml" todir="${dest}"/>
-		<copy todir="${dest}/testprograms">
-			<fileset dir="testprograms" />
-		</copy>		
-		<copy todir="${dest}/testjars">
-			<fileset dir="testjars" />
-		</copy>
-		<copy todir="${dest}/testresources">
-			<fileset dir="testresources" />
-		</copy>				
-	</target>
-	
-</project>
diff --git a/org.eclipse.jdt.debug.tests/scripts/exportplugins.xml b/org.eclipse.jdt.debug.tests/scripts/exportplugins.xml
deleted file mode 100644
index a701401..0000000
--- a/org.eclipse.jdt.debug.tests/scripts/exportplugins.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<project name="exportplugins" default="export" basedir=".">
-	<target name="init">
-		<tstamp/>
-		<available file="../../org.eclipse.ui.externaltools/scripts/exportplugin.xml" property="externaltools.exists"/>
-		<available file="../../org.eclipse.ant.core/scripts/exportplugin.xml" property="ant.exists"/>
-	</target>
-
-	<target name="export" depends="init" description="Export all debug plugins">
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.debug.core" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.debug.ui" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.debug" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.debug.ui" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.launching" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.launching.j9" target="export"/>
-		<antcall target="ui.externaltools"/>
-		<antcall target="ant.core"/>
-	</target>
-	
-	<target name="ui.externaltools" depends="init" if="externaltools.exists" description="Export the external tools plugin">
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.ui.externaltools" target="export"/>
-	</target>
-	
-	<target name="ant.core" depends="init" if="ant.exists" description="Export the ant core plugin">
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.ant.core" target="export"/>
-	</target>
-</project>
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
deleted file mode 100644
index e6f3a73..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Waits for an event on a specific element
- */
-
-public class DebugElementEventWaiter extends DebugEventWaiter {
-	
-	protected Object fElement;
-	
-	public DebugElementEventWaiter(int kind, Object element) {
-		super(kind);
-		fElement = element;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		return super.accept(event) && fElement == event.getSource();
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
deleted file mode 100644
index 7a3dc38..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Wait for the specified event with the specified from the specified element.
- */
-public class DebugElementKindEventDetailWaiter extends DebugElementKindEventWaiter {
-
-	protected int fDetail;
-
-	public DebugElementKindEventDetailWaiter(int eventKind, Class elementClass, int detail) {
-		super(eventKind, elementClass);
-		fDetail = detail;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		return super.accept(event) && fDetail == event.getDetail();
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
deleted file mode 100644
index bf8cb0c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Waits for a type of event on a kind of element.  Compare this to SpecificDebugElementEventWaiter which is
- * used to wait for a type of event on a specific debug element object.
- */
-
-public class DebugElementKindEventWaiter extends DebugEventWaiter {
-	
-	protected Class fElementClass;
-	
-	public DebugElementKindEventWaiter(int eventKind, Class elementClass) {
-		super(eventKind);
-		fElementClass = elementClass;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		Object o = event.getSource();
-		return super.accept(event) && fElementClass.isInstance(o);
-	}
-
-}
-
-
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
deleted file mode 100644
index 7fc9c46..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-
-/**
- * The <code>DebugEventWaiter</code> is
- * to wait for a specific kind of debug event.
- * <p>
- * When a <code>DebugEventWaiter</code> is created, it
- * registers itself with the <code>IDebugModelManager</code> as
- * a <code>IDebugModelEventListener</code>.
- * <p>
- * NOTE: <code>DebugEventWaiter</code> objects are intended for
- * one time use only!
- */
-public class DebugEventWaiter implements IDebugEventSetListener {
-	/**
-	 * The kind of event the waiter is waiting for
-	 */
-	protected int fEventType;
-
-	/**
-	 * The number of milliseconds the waiter will wait before timing out.
-	 */
-	protected long fTimeout;
-
-	/**
-	 * The <code>IDebugModelManager</code> this waiter is listening to.
-	 */
-	protected DebugPlugin fDebugPlugin;
-
-	/**
-	 * The <code>DebugEvent</code> received.
-	 */
-	protected DebugEvent fEvent;
-	
-	/**
-	 * The event set that was accepted
-	 */
-	protected DebugEvent[] fEventSet;
-
-	/**
-	 * The default timeout value if none is given (20000).
-	 */
-	public static final long DEFAULT_TIMEOUT= 15000;
-
-	/**
-	 * Creates a new <code>DebugEventWaiter</code> which
-	 * waits for events of a kind <code>eventType</code>.
-	 * The wait method will wait the default timeout value.
-	 */
-	public DebugEventWaiter(int eventType) {
-		fDebugPlugin= DebugPlugin.getDefault();
-		fEventType= eventType;
-		fTimeout= DEFAULT_TIMEOUT;
-
-		fDebugPlugin.addDebugEventListener(this);
-	}
-
-	/**
-	 * Answers true if the <code>DebugEvent</code> is acceptable.
-	 */
-	public boolean accept(DebugEvent event) {
-		return event.getKind() == fEventType;
-	}
-	/**
-	 * Answers the event name associated with the given flag.
-	 */
-	public String getEventName(int flag) {
-		switch (flag) {
-			case DebugEvent.CREATE :
-				return "Create";
-			case DebugEvent.TERMINATE :
-				return "Terminate";
-			case DebugEvent.RESUME :
-				return "Resume";
-			case DebugEvent.SUSPEND :
-				return "Suspend";
-			default :
-				return "UNKNOWN";
-		}
-	}
-
-	/**
-	 * Handles debug events.
-	 *
-	 * @see IDebugEventListener
-	 * @see #accept(DebugEvent)
-	 */
-	public synchronized void handleDebugEvents(DebugEvent[] events) {
-		//printReceived(event);
-		//printReceived(event);
-		for (int i = 0; i < events.length; i++) {
-			if (accept(events[i])) {
-				fEvent= events[i];
-				fEventSet = events;
-				notifyAll();
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Prints a message indicating which event was received.
-	 */
-	protected void printReceived(DebugEvent event) {
-		System.out.println(this +" got " + event);
-	}
-
-	/**
-	 * Sets the number of milliseconds to wait for this callback
-	 */
-	public void setTimeout(long milliseconds) {
-		fTimeout= milliseconds;
-	}
-
-	/**
-	 * Unregisters this waiter as a listener
-	 */
-	public void unregister() {
-		fDebugPlugin.removeDebugEventListener(this);
-	}
-
-	/**
-	 * Returns the source of the accepted event, or <code>null</code>
-	 * if no event was accepted.
-	 */
-	public synchronized Object waitForEvent() {
-		if (fEvent == null) {
-			try {
-				wait(fTimeout);
-			} catch (InterruptedException ie) {
-				System.err.println("Interrupted waiting for event");
-			}
-		}
-		unregister();
-		if (fEvent == null)
-			return null;
-		return fEvent.getSource();
-	}
-
-	/**
-	 * Returns the accepted event, if any.
-	 */
-	public DebugEvent getEvent() {
-		return fEvent;
-	}
-	
-	/**
-	 * Returns the accepted event set, if any.
-	 */
-	public DebugEvent[] getEventSet() {
-		return fEventSet;
-	}	
-}
-
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
deleted file mode 100644
index b598e2c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
- 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathProvider;
-
-/**
- * Extension to test classpath providers extension point
- */
-public class EmptyClasspathProvider implements IRuntimeClasspathProvider {
-
-	/**
-	 * @see IRuntimeClasspathProvider#computeUnresolvedClasspath(ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
deleted file mode 100644
index f0f477c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-/**
- * Helper methods to set up a IJavaProject.
- */
-public class JavaProjectHelper {
-	
-	public static final IPath TEST_SRC_DIR= new Path("testprograms");	
-
-	/**
-	 * Creates a IJavaProject.
-	 */	
-	public static IJavaProject createJavaProject(String projectName, String binFolderName) throws CoreException {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject project= root.getProject(projectName);
-		if (!project.exists()) {
-			project.create(null);
-		} else {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		
-		if (!project.isOpen()) {
-			project.open(null);
-		}
-		
-		IPath outputLocation;
-		if (binFolderName != null && binFolderName.length() > 0) {
-			IFolder binFolder= project.getFolder(binFolderName);
-			if (!binFolder.exists()) {
-				binFolder.create(false, true, null);
-			}
-			outputLocation= binFolder.getFullPath();
-		} else {
-			outputLocation= project.getFullPath();
-		}
-		
-		if (!project.hasNature(JavaCore.NATURE_ID)) {
-			addNatureToProject(project, JavaCore.NATURE_ID, null);
-		}
-		
-		IJavaProject jproject= JavaCore.create(project);
-		
-		jproject.setOutputLocation(outputLocation, null);
-		jproject.setRawClasspath(new IClasspathEntry[0], null);
-		
-		return jproject;	
-	}
-	
-	/**
-	 * Removes a IJavaProject.
-	 */		
-	public static void delete(IJavaProject jproject) throws CoreException {
-		jproject.setRawClasspath(new ClasspathEntry[0], jproject.getProject().getFullPath(), null);
-		jproject.getProject().delete(true, true, null);
-	}
-
-
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	public static IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String containerName) throws CoreException {
-		IProject project= jproject.getProject();
-		IContainer container= null;
-		if (containerName == null || containerName.length() == 0) {
-			container= project;
-		} else {
-			IFolder folder= project.getFolder(containerName);
-			if (!folder.exists()) {
-				folder.create(false, true, null);
-			}
-			container= folder;
-		}
-		IPackageFragmentRoot root= jproject.getPackageFragmentRoot(container);
-		
-		IClasspathEntry cpe= JavaCore.newSourceEntry(root.getPath());
-		addToClasspath(jproject, cpe);		
-		return root;
-	}
-
-	/**
-	 * Adds a source container to a IJavaProject and imports all files contained
-	 * in the given Zip file.
-	 */	
-	public static IPackageFragmentRoot addSourceContainerWithImport(IJavaProject jproject, String containerName, ZipFile zipFile) throws InvocationTargetException, CoreException {
-		IPackageFragmentRoot root= addSourceContainer(jproject, containerName);
-		importFilesFromZip(zipFile, root.getPath(), null);
-		return root;
-	}
-
-	/**
-	 * Removes a source folder from a IJavaProject.
-	 */		
-	public static void removeSourceContainer(IJavaProject jproject, String containerName) throws CoreException {
-		IFolder folder= jproject.getProject().getFolder(containerName);
-		removeFromClasspath(jproject, folder.getFullPath());
-		folder.delete(true, null);
-	}
-
-	/**
-	 * Adds a library entry to a IJavaProject.
-	 */	
-	public static IPackageFragmentRoot addLibrary(IJavaProject jproject, IPath path) throws JavaModelException {
-		return addLibrary(jproject, path, null, null);
-	}
-
-	/**
-	 * Adds a library entry with source attchment to a IJavaProject.
-	 */			
-	public static IPackageFragmentRoot addLibrary(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newLibraryEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		return jproject.getPackageFragmentRoot(path.toString());
-	}
-
-	/**
-	 * Copies the library into the project and adds it as library entry.
-	 */			
-	public static IPackageFragmentRoot addLibraryWithImport(IJavaProject jproject, IPath jarPath, IPath sourceAttachPath, IPath sourceAttachRoot) throws IOException, CoreException {
-		IProject project= jproject.getProject();
-		IFile newFile= project.getFile(jarPath.lastSegment());
-		InputStream inputStream= null;
-		try {
-			inputStream= new FileInputStream(jarPath.toFile()); 
-			newFile.create(inputStream, true, null);
-		} finally {
-			if (inputStream != null) {
-				try { inputStream.close(); } catch (IOException e) { }
-			}
-		}				
-		return addLibrary(jproject, newFile.getFullPath(), sourceAttachPath, sourceAttachRoot);
-	}	
-
-		
-	/**
-	 * Adds a variable entry with source attchment to a IJavaProject.
-	 * Can return null if variable can not be resolved.
-	 */			
-	public static IPackageFragmentRoot addVariableEntry(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newVariableEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		IPath resolvedPath= JavaCore.getResolvedVariablePath(path);
-		if (resolvedPath != null) {
-			return jproject.getPackageFragmentRoot(resolvedPath.toString());
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * Adds a required project entry.
-	 */		
-	public static void addRequiredProject(IJavaProject jproject, IJavaProject required) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newProjectEntry(required.getProject().getFullPath());
-		addToClasspath(jproject, cpe);
-	}	
-	
-	public static void removeFromClasspath(IJavaProject jproject, IPath path) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		int nEntries= oldEntries.length;
-		ArrayList list= new ArrayList(nEntries);
-		for (int i= 0 ; i < nEntries ; i++) {
-			IClasspathEntry curr= oldEntries[i];
-			if (!path.equals(curr.getPath())) {
-				list.add(curr);			
-			}
-		}
-		IClasspathEntry[] newEntries= (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);
-		jproject.setRawClasspath(newEntries, null);
-	}	
-
-	private static void addToClasspath(IJavaProject jproject, IClasspathEntry cpe) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		for (int i= 0; i < oldEntries.length; i++) {
-			if (oldEntries[i].equals(cpe)) {
-				return;
-			}
-		}
-		int nEntries= oldEntries.length;
-		IClasspathEntry[] newEntries= new IClasspathEntry[nEntries + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, nEntries);
-		newEntries[nEntries]= cpe;
-		jproject.setRawClasspath(newEntries, null);
-	}
-	
-			
-	private static void addNatureToProject(IProject proj, String natureId, IProgressMonitor monitor) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures= description.getNatureIds();
-		String[] newNatures= new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length]= natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, monitor);
-	}
-	
-	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
-		ZipFileStructureProvider structureProvider=	new ZipFileStructureProvider(srcZipFile);
-		try {
-			ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}
-	
-	public static void importFilesFromDirectory(File rootDir, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException, IOException {		
-		IImportStructureProvider structureProvider = FileSystemStructureProvider.INSTANCE;
-		List files = new ArrayList(100);
-		addJavaFiles(rootDir, files);
-		try {
-			ImportOperation op= new ImportOperation(destPath, rootDir, structureProvider, new ImportOverwriteQuery(), files);
-			op.setCreateContainerStructure(false);
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}	
-	
-	private static void addJavaFiles(File dir, List collection) throws IOException {
-		File[] files = dir.listFiles();
-		List subDirs = new ArrayList(2);
-		for (int i = 0; i < files.length; i++) {
-			if (files[i].isFile()) {
-				collection.add(files[i]);
-			} else if (files[i].isDirectory()) {
-				subDirs.add(files[i]);
-			}
-		}
-		Iterator iter = subDirs.iterator();
-		while (iter.hasNext()) {
-			File subDir = (File)iter.next();
-			addJavaFiles(subDir, collection);
-		}
-	}
-	
-	private static class ImportOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String file) {
-			return ALL;
-		}	
-	}		
-	
-	
-}
-
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
deleted file mode 100644
index 2281bad..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-public class JavaTestPlugin extends AbstractUIPlugin {
-	
-	private static JavaTestPlugin fgDefault;
-	
-	public JavaTestPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgDefault= this;
-	}
-	
-	public static JavaTestPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	public static void enableAutobuild(boolean enable) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= JavaTestPlugin.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			URL installURL= new URL(getDescriptor().getInstallURL(), path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java
deleted file mode 100644
index 03cc460..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-// copied from startup.jar. planned to be removed soon
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileFilter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-/**
- * Startup class for Eclipse. Creates a class loader using
- * supplied URL of platform installation, loads and calls
- * the Eclipse Boot Loader.  The startup arguments are as follows:
- * <dl>
- * <dd>
- *    -application &lt;id&gt;: the identifier of the application to run
- * </dd>
- * <dd>
- *    -boot &lt;location&gt;: the location, expressed as a URL, of the platform's boot.jar
- * </dd>
- * <dd>
- *    -consolelog : enables log to the console. Handy when combined with -debug
- * </dd>
- * <dd>
- *    -data &lt;location&gt;: sets the workspace location and the default location for projects
- * </dd>
- * <dd>
- *    -debug [options file]: turns on debug mode for the platform and optionally specifies a location
- * for the .options file. This file indicates what debug points are available for a
- * plug-in and whether or not they are enabled. If a location is not specified, the platform searches
- * for the .options file under the install directory
- * </dd>
- * <dd>
- *    -dev [entries]: turns on dev mode and optionally specifies comma-separated class path entries
- * which are added to the class path of each plug-in
- * </dd>
- * <dd>
- *    -keyring &lt;location&gt;: the location of the authorization database on disk. This argument
- * has to be used together with the -password argument
- * </dd>
- * <dd>
- *    -password &lt;passwd&gt;: the password for the authorization database
- * </dd>
- * <dd>
- *    -plugins &lt;location&gt;: The arg is a URL pointing to a file which specs the plugin 
- * path for the platform.  The file is in property file format where the keys are user-defined 
- * names and the values are comma separated lists of either explicit paths to plugin.xml 
- * files or directories containing plugins. (e.g., .../eclipse/plugins).
- * </dd>
- * <dd>
- *    -ws &lt;window system&gt;: sets the window system value
- * </dd>
- * </dl>
- */
-public class Main {
-	/**
-	 * Indicates whether this instance is running in debug mode.
-	 */
-	protected boolean debug = false;
-	
-	/**
-	 * The location of the launcher to run.
-	 */
-	protected String bootLocation = null;
-	
-	/**
-	 * The identifier of the application to run.
-	 */
-	protected String application;
-	
-	/**
-	 * The path for finding find plugins.
-	 */
-	protected URL pluginPathLocation;
-	
-	/**
-	 * The boot path location.
-	 */
-	protected String location;
-	
-	/**
-	 * Indicates whether items for UNinstallation should be looked for.
-	 */
-	protected boolean uninstall = false;
-	
-	/**
-	 * The item to be uninstalled.
-	 */
-	protected String uninstallCookie;
-	
-	/**
-	 * The class path entries.
-	 */
-	protected String devClassPath = null;
-	
-	/**
-	 * Indicates whether this instance is running in development mode.
-	 */
-	protected boolean inDevelopmentMode = false;
-
-	// static token describing how to take down the splash screen
-	private static String endSplash = null;
-	
-	// constants
-	private static final String APPLICATION = "-application";
-	private static final String BOOT = "-boot";
-	private static final String DEBUG = "-debug";
-	private static final String DEV = "-dev";
-	private static final String ENDSPLASH = "-endsplash";
-	private static final String UNINSTALL = "-uninstall";
-	private static final String PI_BOOT = "org.eclipse.core.boot";
-	private static final String BOOTLOADER = "org.eclipse.core.boot.BootLoader";
-	private static final String UPDATELOADER = "org.eclipse.core.internal.boot.LaunchInfo";
-
-	// The project containing the boot loader code.  This is used to construct
-	// the correct class path for running in VAJ and VAME.
-	private static final String PROJECT_NAME = "Eclipse Core Boot";
-
-	private static boolean inVAJ;
-	static {
-		try {
-			Class.forName("com.ibm.uvm.lang.ProjectClassLoader");
-			inVAJ = true;
-		} catch (Exception e) {
-			inVAJ = false;
-		}
-	}
-	private static boolean inVAME;
-	static {
-		try {
-			Class.forName("com.ibm.eclipse.core.VAME");
-			inVAME = true;
-		} catch (Exception e) {
-			inVAME = false;
-		}
-	}
-
-/**
- * Executes the launch.
- * 
- * @return the result of performing the launch
- * @param args command-line arguments
- * @exception Exception thrown if a problem occurs during the launch
- */
-protected Object basicRun(String[] args) throws Exception {
-	Class clazz = getBootLoader(bootLocation);
-	Method method = clazz.getDeclaredMethod("run", new Class[] { String.class, URL.class, String.class, String[].class });
-	try {
-		return method.invoke(clazz, new Object[] { application, pluginPathLocation, location, args });
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-
-/**
- * Returns the result of converting a list of comma-separated tokens into an array
- * 
- * @return the array of string tokens
- * @param prop the initial comma-separated string
- */
-private String[] getArrayFromList(String prop) {
-	if (prop == null || prop.trim().equals(""))
-		return new String[0];
-	Vector list = new Vector();
-	StringTokenizer tokens = new StringTokenizer(prop, ",");
-	while (tokens.hasMoreTokens()) {
-		String token = tokens.nextToken().trim();
-		if (!token.equals(""))
-			list.addElement(token);
-	}
-	return list.isEmpty() ? new String[0] : (String[]) list.toArray(new String[0]);
-}
-/**
- * Creates and returns a platform <code>BootLoader</code> which can be used to start
- * up and run the platform.  The given base, if not <code>null</code>,
- * is the location of the boot loader code.  If the value is <code>null</code>
- * then the boot loader is located relative to this class.
- * 
- * @return the new boot loader
- * @param base the location of the boot loader
- */
-public Class getBootLoader(String base) throws Exception {
-	URLClassLoader loader = new URLClassLoader(getBootPath(base), null);
-	return loader.loadClass(BOOTLOADER);
-}
-/**
- * Returns the <code>URL</code>-based class path describing where the boot classes
- * are located when running in development mode.
- * 
- * @return the url-based class path
- * @param base the base location
- * @exception MalformedURLException if a problem occurs computing the class path
- */
-protected URL[] getDevPath(URL base) throws MalformedURLException {
-	URL url;
-	String devBase = base.toExternalForm();
-	if (!inDevelopmentMode) {
-		url = new URL(devBase + "boot.jar");
-		return new URL[] {url};
-	}
-	String[] locations = getArrayFromList(devClassPath);
-	ArrayList result = new ArrayList(locations.length);
-	for (int i = 0; i < locations.length; i++) {
-		String spec = devBase + locations[i];
-		char lastChar = spec.charAt(spec.length() - 1);
-		if ((spec.endsWith(".jar") || (lastChar == '/' || lastChar == '\\')))
-			url = new URL (spec);
-		else
-			url = new URL(spec + "/");
-		//make sure URL exists before adding to path
-		if (new java.io.File(url.getFile()).exists())
-			result.add(url);
-	}
-	url = new URL(devBase + "boot.jar");
-	if (new java.io.File(url.getFile()).exists())
-		result.add(url);
-	return (URL[])result.toArray(new URL[result.size()]);
-}
-
-/**
- * Returns the <code>URL</code>-based class path describing where the boot classes are located.
- * 
- * @return the url-based class path
- * @param base the base location
- * @exception MalformedURLException if a problem occurs computing the class path
- */
-protected URL[] getBootPath(String base) throws MalformedURLException {
-	URL url = null;
-	// if the given location is not null, assume it is correct and use it. 
-	if (base != null) {
-		url = new URL(base);
-		if (debug)
-			System.out.println("Boot URL: " + url.toExternalForm());
-		return new URL[] {url};	
-	}
-	// Create a URL based on the location of this class' code.
-	// strip off jar file and/or last directory to get 
-	// to the directory containing projects.
-	URL[] result = null;
-	url = getClass().getProtectionDomain().getCodeSource().getLocation();
-	String path = url.getFile();
-	if (path.endsWith(".jar"))
-		path = path.substring(0, path.lastIndexOf("/"));
-	else 
-		if (path.endsWith("/"))
-			path = path.substring(0, path.length() - 1);
-	if (inVAJ || inVAME) {
-		int ix = path.lastIndexOf("/");
-		path = path.substring(0, ix + 1);
-		path = path + PROJECT_NAME + "/";
-		url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-		result = new URL[] {url};
-	} else {
-		path = searchForPlugins(path);
-		path = searchForBoot(path);
-		// add on any dev path elements
-		url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-		result = getDevPath(url);
-	}
-	if (debug) {
-		System.out.println("Boot URL:");
-		for (int i = 0; i < result.length; i++)
-			System.out.println("    " + result[i].toExternalForm());	
-	}
-	return result;
-}
-
-/**
- * Searches for a plugins root starting at a given location.  If one is
- * found then this location is returned; otherwise an empty string is
- * returned.
- * 
- * @return the location where plugins were found, or an empty string
- * @param start the location to begin searching at
- */
-protected String searchForPlugins(String start) {
-	File path = new File(start);
-	while (path != null) {
-		File test = new File(path, "plugins");
-		if (test.exists())
-			return test.toString();
-		path = path.getParentFile();
-		path = (path == null || path.length() == 1)  ? null : path;
-	}
-	return "";
-}
-/**
- * Searches for a boot directory starting at a given location.  If one
- * is found then this location is returned; otherwise an empty string
- * is returned.
- * 
- * @return the location where plugins were found, or an empty string
- * @param start the location to begin searching at
- */
-protected String searchForBoot(String start) {
-	FileFilter filter = new FileFilter() {
-		public boolean accept(File candidate) {
-			return candidate.getName().startsWith(PI_BOOT);
-		}
-	};
-	File[] boots = new File(start).listFiles(filter);
-	String result = null;
-	String maxVersion = null;
-	for (int i = 0; i < boots.length; i++) {
-		String name = boots[i].getName();
-		int index = name.lastIndexOf('_');
-		if (index == -1) {
-			result = boots[i].getAbsolutePath();
-			i = boots.length;
-		} else {
-			if (index > 0) {
-				String version = name.substring(index + 1);
-				if (maxVersion == null) {
-					result = boots[i].getAbsolutePath();
-					maxVersion = version;
-				} else
-					if (maxVersion.compareTo(version) == -1) {
-						result = boots[i].getAbsolutePath();
-						maxVersion = version;
-					}						
-			}
-		}
-	}
-	if (result == null)
-		throw new RuntimeException("Could not find bootstrap code. Check location of boot plug-in or specify -boot.");
-	return result.replace(File.separatorChar, '/') + "/";
-}
-/**
- * Returns the update loader for the given boot path.
- * 
- * @return the update loader
- * @param base the boot path base
- * @exception Exception thrown is a problem occurs determining this loader
- */
-public Class getUpdateLoader(String base) throws Exception {
-	URLClassLoader loader = new URLClassLoader(getBootPath(base), null);
-	return loader.loadClass(UPDATELOADER);
-}
-/**
- * Runs the platform with the given arguments.  The arguments must identify
- * an application to run (e.g., <code>-application com.example.application</code>).
- * After running the application <code>System.exit(N)</code> is executed.
- * The value of N is derived from the value returned from running the application.
- * If the application's return value is an <code>Integer</code>, N is this value.
- * In all other cases, N = 0.
- * <p>
- * Clients wishing to run the platform without a following <code>System.exit</code>
- * call should use <code>run()</code>.
- *
- * @see #run
- * 
- * @param args the command line arguments
- */
-public static void main(String[] args) {
-	Object result = null;
-	try {
-		result = new Main().run(args);
-	} catch (Throwable e) {
-		// try and take down the splash screen.
-		endSplash();
-		System.out.println("Exception launching the Eclipse Platform:");
-		e.printStackTrace();
-	}
-	int exitCode = result instanceof Integer ? ((Integer) result).intValue() : 0;
-	System.exit(exitCode);
-}
-/**
- * Tears down the currently-displayed splash screen.
- */
-public static void endSplash() {
-	if (endSplash == null)
-		return;
-	try {
-		Runtime.getRuntime().exec(endSplash);
-	} catch (Exception e) {
-	}
-}
-
-/**
- * Runs this launcher with the arguments specified in the given string.
- * 
- * @param argString the arguments string
- * @exception Exception thrown if a problem occurs during launching
- */
-public static void main(String argString) throws Exception {
-	Vector list = new Vector(5);
-	for (StringTokenizer tokens = new StringTokenizer(argString, " "); tokens.hasMoreElements();)
-		list.addElement((String) tokens.nextElement());
-	main((String[]) list.toArray(new String[list.size()]));
-}
-
-/**
- * Processes the command line arguments
- * 
- * @return the arguments to pass through to the launched application
- * @param args the command line arguments
- */
-protected String[] processCommandLine(String[] args) throws Exception {
-	int[] configArgs = new int[100];
-	configArgs[0] = -1; // need to initialize the first element to something that could not be an index.
-	int configArgIndex = 0;
-	for (int i = 0; i < args.length; i++) {
-		boolean found = false;
-		// check for args without parameters (i.e., a flag arg)
-		// check if debug should be enabled for the entire platform
-		if (args[i].equalsIgnoreCase(DEBUG)) {
-			debug = true;
-			// passed thru this arg (i.e., do not set found = true
-			continue;
-		}
-		
-		// check if development mode should be enabled for the entire platform
-		// If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), 
-		// simply enable development mode.  Otherwise, assume that that the following arg is
-		// actually some additional development time class path entries.  This will be processed below.
-		if (args[i].equalsIgnoreCase(DEV) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) {
-			inDevelopmentMode = true;
-			// do not mark the arg as found so it will be passed through
-			continue;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i;
-			continue;
-		}
-		// check for args with parameters. If we are at the last argument or if the next one
-		// has a '-' as the first character, then we can't have an arg with a parm so continue.
-		if (i == args.length - 1 || args[i + 1].startsWith("-")) 
-			continue;
-		String arg = args[++i];
-
-		// look for the laucher to run
-		if (args[i - 1].equalsIgnoreCase(BOOT)) {
-			bootLocation = arg;
-			found = true;
-		}
-
-		// look for the development mode and class path entries.  
-		if (args[i - 1].equalsIgnoreCase(DEV)) {
-			inDevelopmentMode = true;
-			devClassPath = arg;
-			continue;
-		}
-
-		// look for the application to run
-		if (args[i - 1].equalsIgnoreCase(APPLICATION)) {
-			application = arg;
-			found = true;
-		}
-
-		// look for token to use to end the splash screen
-		if (args[i - 1].equalsIgnoreCase(ENDSPLASH)) {
-			endSplash = arg;
-			continue;
-		}
-
-		// look for items to uninstall
-		if (args[i - 1].equalsIgnoreCase(UNINSTALL)) {
-			uninstall = true;
-			uninstallCookie = arg;
-			found = true;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i - 1;
-			configArgs[configArgIndex++] = i;
-		}
-	}
-	// remove all the arguments consumed by this argument parsing
-	if (configArgIndex == 0)
-		return args;
-	String[] passThruArgs = new String[args.length - configArgIndex];
-	configArgIndex = 0;
-	int j = 0;
-	for (int i = 0; i < args.length; i++) {
-		if (i == configArgs[configArgIndex])
-			configArgIndex++;
-		else
-			passThruArgs[j++] = args[i];
-	}
-	return passThruArgs;
-}
-/**
- * Runs the application to be launched.
- * 
- * @return the return value from the launched application
- * @param args the arguments to pass to the application
- * @exception thrown if a problem occurs during launching
- */
-public Object run(String[] args) throws Exception {
-	String[] passThruArgs = processCommandLine(args);
-	if (uninstall)
-		return updateRun(UNINSTALL, uninstallCookie, passThruArgs);
-	else
-		return basicRun(passThruArgs);
-}
-/**
- * Performs an update run.
- * 
- * @return the return value from the update loader
- * @param flag flag to give to the update loader
- * @param value value to give to the update loader
- * @param args arguments to give to the update loader.
- * @exception Exception thrown if a problem occurs during execution
- */
-protected Object updateRun(String flag, String value, String[] args) throws Exception {
-	Class clazz = getUpdateLoader(bootLocation);
-	Method method = clazz.getDeclaredMethod("run", new Class[] { String.class, String.class, String.class, String[].class });
-	try {
-		return method.invoke(clazz, new Object[] { flag, value, location, args });
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java
deleted file mode 100644
index 3a257d2..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-/** 
- * Application is responsible for calling core launch api
- */
-
-public class NewMain extends Main {
-	private static final String DEFAULT_APPLICATION= "org.eclipse.ui.workbench";
-	
-	
-	public NewMain(String application, String location, URL pluginPathLocation, String bootLocation, boolean debug) throws IOException {
-		this.application= application;
-		this.location= location;
-		this.pluginPathLocation= pluginPathLocation;
-		this.bootLocation= bootLocation;
-	}
-	
-	public static void main(String[] args) {
-		try {
-			String location= getLocationFromProperties("platform");
-			new NewMain(DEFAULT_APPLICATION, location, null, null, true).run(args);
-		} catch (Throwable e) {
-			System.out.println("Exception launching the Eclipse Platform UI:");
-			e.printStackTrace();
-		}
-		System.exit(0);
-	}
-	
-
-	/**
-	 * Run this launcher with the arguments specified in the given string.
-	 * This is a short cut method for people running the launcher from
-	 * a scrapbook (i.e., swip-and-doit facility).
-	 */
-	public static void main(String argString) throws Exception {
-		Vector list= new Vector(5);
-		for (StringTokenizer tokens= new StringTokenizer(argString, " "); tokens.hasMoreElements();)
-			list.addElement((String) tokens.nextElement());
-		main((String[]) list.toArray(new String[list.size()]));
-	}
-	
-	public static String getLocationFromProperties(String key) {
-		Properties properties= new Properties();
-		try {
-			FileInputStream fis= new FileInputStream(getSettingsFile());
-			properties.load(fis);
-			return properties.getProperty(key);
-		} catch (IOException e) {
-		}
-		return null;
-	}	
-	
-	private static File getSettingsFile() {
-		String home= System.getProperty("user.home");
-		if (home == null) {
-			System.out.println("Home dir not defined");
-			return null;
-		}
-		return new File(home, "eclipse-workspaces.properties");	
-	}	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
deleted file mode 100644
index a125f74..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IDebugElement;
-
-/**
- * This event waiter is used to wait for a certain type of event (create, terminate, suspend, etc.) 
- * on a *specific* debug element.  Contrast this with DebugElementKindEventWaiter which is similar, 
- * but is used to wait for a certain type of event on a *kind* of debug element (thread, debug target, etc.)
- */
-public class SpecificDebugElementEventWaiter extends DebugEventWaiter {
-
-	protected IDebugElement fDebugElement;
-	
-	public SpecificDebugElementEventWaiter(int eventKind, IDebugElement element) {
-		super(eventKind);
-		fDebugElement = element;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		Object o = event.getSource();
-		if (o instanceof IDebugElement) {
-			return super.accept(event) && ((IDebugElement)o).equals(fDebugElement);
-		} else {
-			return false;
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java
deleted file mode 100644
index 50d7d68..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.net.URL;
-
-/**
- * Helper class to launch a test
- */
-public class TestPluginLauncher {
-	
-	public static final String APP_NAME= "org.eclipse.jdt.debug.tests.app";
-	
-	public static void run(String location, Class testCase, String[] args) {
-		run(APP_NAME, location, testCase, args);
-	}
-	
-	public static void run(String application, String location, Class testCase, String[] args) {
-		try {
-			String bootLocation= getBootLocation();
-			int nArgs= args.length;
-			String[] newArgs= new String[4 + nArgs];
-			newArgs[0]= testCase.getName();
-			for (int i= 0; i < nArgs; i++) {
-				newArgs[1 + i]= args[i];
-			}
-			newArgs[1 + nArgs]= "-dev";
-			newArgs[1 + nArgs + 1]= "bin";
-			newArgs[1 + nArgs + 2]= "-debug";
-			NewMain newMain= new NewMain(application, location, null, bootLocation, false);
-			newMain.run(newArgs);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public static String getLocationFromProperties(String key) {
-		return NewMain.getLocationFromProperties(key);
-	}
-	
-	public static String getLocationFromProperties() {
-		return NewMain.getLocationFromProperties("tests");
-	}
-	
-	public static String getBootLocation() {
-		URL url= TestPluginLauncher.class.getResource("TestPluginLauncher.class");
-		String s= url.toString();
-		int index= s.indexOf("/org.eclipse.jdt.debug.tests");
-		if (index == -1)
-			throw new IllegalArgumentException();
-		s= s.substring(0, index);
-		s= s + "/org.eclipse.core.boot/boot.jar";
-		return s;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java
deleted file mode 100644
index 5410092..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.internal.Workbench;
-
-public class TestWorkbench extends Workbench {
-
-	/**
-	 * Run an event loop for the workbench.
-	 */
-	protected void runEventLoop() {
-		// Dispatch all events.
-		Display display = Display.getCurrent();
-		while (true) {
-			try {
-				if (!display.readAndDispatch())
-					break;
-			} catch (Throwable e) {
-				break;
-			}
-		}
-		IPath location= JavaTestPlugin.getWorkspace().getRoot().getLocation();
-		System.out.println("Workspace-location: " + location.toString());
-				
-		
-		String[] args= getCommandLineArgs();
-		if (args.length > 2) {
-			try {
-				Test test= getTest(args[2]);
-				TestRunner.run(test);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		} else {
-			System.out.println("TestWorkbench: Argument must be class name");
-		}
-				
-		close();
-				
-	}
-	
-	public Test getTest(String className) throws Exception {
-		Class testClass= getClass().getClassLoader().loadClass(className);
-
-		Method suiteMethod= null;
-		try {
-			suiteMethod= testClass.getMethod(TestRunner.SUITE_METHODNAME, new Class[0]);
-	 	} catch (Exception e) {
-	 		// try to extract a test suite automatically	
-			return new TestSuite(testClass);
-		}
-		try {
-			return (Test) suiteMethod.invoke(null, new Class[0]); // static method
-		} catch (InvocationTargetException e) {
-			System.out.println("Failed to invoke suite():" + e.getTargetException().toString());
-		} catch (IllegalAccessException e) {
-			System.out.println("Failed to invoke suite():" + e.toString());
-		}
-		return null; 
-
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test.xml b/org.eclipse.jdt.debug.tests/test.xml
deleted file mode 100644
index 24ecf1b..0000000
--- a/org.eclipse.jdt.debug.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.debug.tests"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.debug.tests.AutomatedSuite"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>
diff --git a/org.eclipse.jdt.debug.tests/testjars/A.jar b/org.eclipse.jdt.debug.tests/testjars/A.jar
deleted file mode 100644
index 74d8b44..0000000
--- a/org.eclipse.jdt.debug.tests/testjars/A.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm b/org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm
deleted file mode 100644
index 8ae2294..0000000
--- a/org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm
+++ /dev/null
@@ -1,972 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List href="./Debug%20Test%20Plan%202.0_files/filelist.xml">

-<title>Debug Test Plan</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Author>Dwright</o:Author>

-  <o:Template>Normal</o:Template>

-  <o:LastAuthor>Dwright</o:LastAuthor>

-  <o:Revision>5</o:Revision>

-  <o:TotalTime>8</o:TotalTime>

-  <o:Created>2002-06-02T23:48:00Z</o:Created>

-  <o:LastSaved>2002-06-02T23:56:00Z</o:LastSaved>

-  <o:Pages>3</o:Pages>

-  <o:Words>542</o:Words>

-  <o:Characters>3095</o:Characters>

-  <o:Company>Object Technology International</o:Company>

-  <o:Lines>25</o:Lines>

-  <o:Paragraphs>6</o:Paragraphs>

-  <o:CharactersWithSpaces>3800</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]-->

-<style>

-<!--

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

- /* List Definitions */

-@list l0

-	{mso-list-id:228659936;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-1316170924 -726361272 -1248023756 2108705260 1145722112 1657806012 -1586299904 542178834 -1748712632 1091063270;}

-@list l0:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l1

-	{mso-list-id:308173531;

-	mso-list-type:hybrid;

-	mso-list-template-ids:2060218726 -841305424 -1959476236 2947934 -259121348 -1280253820 -303380956 -268826074 -1521839772 898945252;}

-@list l1:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l2

-	{mso-list-id:354161772;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1553357098 195446546 -661373922 -1240453266 -333671788 -1348988594 1500779028 -873200818 870580272 1904113856;}

-@list l2:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l3

-	{mso-list-id:402680193;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-2122823714 1635152138 -90003044 993399286 1227363908 -1995941908 -1926622552 596146650 629071842 -1986749358;}

-@list l3:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l4

-	{mso-list-id:548685869;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1558743908 -159457064 976809258 751715478 -1584903882 -388094338 266210146 470566120 -201926624 -229759450;}

-@list l4:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l5

-	{mso-list-id:732050242;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1819465034 -46509972 -772614290 606873998 -1471119476 -1754786104 1012273652 244462330 4108232 1063687738;}

-@list l5:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l6

-	{mso-list-id:926696578;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-504352970 -2088215428 1624663696 675558382 -1064935048 -1145565904 684256716 1027522340 1776835744 -244406254;}

-@list l6:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l7

-	{mso-list-id:1277255895;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-1041881232 1740522554 -1179631362 -950774052 -1658823352 368886886 703990130 -1040175210 -156755178 2144234958;}

-@list l7:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l7:level2

-	{mso-level-number-format:bullet;

-	mso-level-text:o;

-	mso-level-tab-stop:1.0in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:"Courier New";

-	mso-bidi-font-family:"Times New Roman";}

-@list l8

-	{mso-list-id:1297756616;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-105480334 -1454842910 383389470 1802041812 -709620050 -1688580750 -1682028544 -2119902570 655414548 57444902;}

-@list l8:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l9

-	{mso-list-id:1696686681;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1837368118 -1668529946 1175091472 -726900266 -788501314 716572452 1569231992 1297110560 2042646458 -431037346;}

-@list l9:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l10

-	{mso-list-id:1957834481;

-	mso-list-type:hybrid;

-	mso-list-template-ids:717788732 152189758 885009062 1899793822 -1984283884 -503179984 1497545442 -317410578 -849162318 1823475886;}

-@list l10:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l10:level2

-	{mso-level-number-format:bullet;

-	mso-level-text:o;

-	mso-level-tab-stop:1.0in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:"Courier New";

-	mso-bidi-font-family:"Times New Roman";}

-@list l11

-	{mso-list-id:1959213535;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-724371470 -1141718406 1398717366 -1149571100 -1296281456 -213096834 1836583102 -1185509228 -4038170 134529380;}

-@list l11:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l12

-	{mso-list-id:1961298044;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1457928864 1440107084 -1753425896 -1722105342 2133986266 -376150224 696292266 1211000006 -1920697944 -1955302124;}

-@list l12:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-ol

-	{margin-bottom:0in;}

-ul

-	{margin-bottom:0in;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<h1>Debug Test Plan</h1>

-

-<p>This documented was last updated June 2, 2002, for test pass 2.</p>

-

-<h2>Virtual Machines&amp; Platforms</h2>

-

-<h3>VMs</h3>

-

-<p>Test with JREs as well as with full JDKs</p>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Sun</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l2 level1 lfo1;tab-stops:list .5in'>1.3.1_01 or higher</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l2 level1 lfo1;tab-stops:list .5in'>1.4.1 B10 or higher</li>

-</ul>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>IBM</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l12 level1 lfo2;tab-stops:list .5in'>1.3.0 (build 1.3.0, J2RE

-     1.3.0 IBM build cn130-20010925)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l12 level1 lfo2;tab-stops:list .5in'>1.3.1 (build 1.3.1, J2RE

-     1.3.1 IBM Windows 32 build cn131-20020403)</li>

-</ul>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>J9</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l1 level1 lfo3;tab-stops:list .5in'>20020206 or higher</li>

-</ul>

-

-<h3>Platforms</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Windows 2000/NT</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Windows XP</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Linux</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Double byte (Japanese)</li>

-</ul>

-

-<h2>Function</h2>

-

-<h3>Breakpoints {Darin W}</h3>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>(Breakpoint

-tests are a good candidate for automation)<o:p></o:p></p>

-

-<table border=1 cellspacing=0 cellpadding=0 style='border-collapse:collapse;

- border:none;mso-border-alt:solid windowtext .5pt;mso-padding-alt:0in 5.4pt 0in 5.4pt'>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Enable</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Disable</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Hit

-  count</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Condition</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Suspend

-  VM</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Suspend

-  thread</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Caught</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Uncaught</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Entry</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Exit</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Access</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Modification</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Thread

-  filter</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Scope</p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Line

-  Breakpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Exception

-  Breakpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Watchpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Method

-  Breakpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

- </tr>

-</table>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l8 level1 lfo5;tab-stops:list .5in'><u1:p></u1:p>Suspend on

-     uncaught exceptions</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l8 level1 lfo5;tab-stops:list .5in'>Suspend on compilation errors</li>

-</ul>

-

-<h3>HotSwap {Darin S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l5 level1 lfo6;tab-stops:list .5in'>J9 and Sun</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l5 level1 lfo6;tab-stops:list .5in'>Negative cases (i.e. handle

-     failures)</li>

-</ul>

-

-<h3>Launch Configurations {Jared B/Luc B}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Local &amp; Remote Java

-     Applications</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Creation of default launch

-     configurations in dialog the dialog (via new button, based on workbench

-     selection)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Creation of default launch

-     configurations using “Debug/Run As…” actions</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using non-default class path

-     &amp; source lookup path</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using non-default working

-     directory</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Sharing default and

-     non-default launch configurations, on different OSÂ’s (i.e. Linux to

-     Windows)</li>

- <ul type=circle>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l7 level2 lfo7;tab-stops:list 1.0in'>Sharing of classpaths</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l7 level2 lfo7;tab-stops:list 1.0in'>Sharing of JREs via

-      new “container” support</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l7 level2 lfo7;tab-stops:list 1.0in'>Sharing/using non-standard

-      variables on the classpath</li>

- </ul>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Launching java programs not

-     contained in the workspace (i.e. just use as a tool to launch external

-     Java programs)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using new “Container” support

-     to reference JREs (instead of JRE_LIB).</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using JREs with &gt; 1 jar</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Starting a workspace after

-     deleting/renaming all installed JREs (can we handle it gracefully?)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Hot keys for re-launch</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Perspective switching</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Favorites</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Handling of launch

-     configurations with missing plug-in. I.e. create a runtime workbench

-     configuration, and then run the workbench without PDE.</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Saving &amp; building before

-     launching, based on preferences</li>

-</ul>

-

-<h3>Source Lookup {Jared B/Luc B}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l0 level1 lfo8;tab-stops:list .5in'>Debugging with non-workspace

-     source</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l0 level1 lfo8;tab-stops:list .5in'>Prompting for source (should

-     update associated launch configuration)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l0 level1 lfo8;tab-stops:list .5in'>Binaries without source

-     (attaching during debug session should make source attach for rest of

-     session and future sessions)</li>

-</ul>

-

-<h3>Evaluation {Darin S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l10 level1 lfo9;tab-stops:list .5in'>Debugger</li>

- <ul type=circle>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Local</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Remote</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Display view</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Variables view –

-      using “this” context as selected variable</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Expression view</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Java editor</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Error handling – i.e.

-      expressions with errors</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>In compilation units

-      (i.e .with source)</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Binaries w/wo source</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Inner types/anonymous

-      types</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Array elements</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Code assist</li>

- </ul>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l10 level1 lfo9;tab-stops:list .5in'>Scrapbook</li>

- <ul type=circle>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>JREs</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Working directory</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Use code from pre-req

-      projects</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Imports</li>

- </ul>

-</ul>

-

-<h3>Console {Joe S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Appearing automatically

-     based on preferences</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Reading Input</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Coloring and fonts</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Navigating from stack traces

-     and Java doc errors to associated types</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Flooding with output</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Wrap &amp; non-wrap modes</li>

-</ul>

-

-<h3>Stepping {Joe S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Variables

-     appearing/disappearing</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Changing variables (red)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Rapid stepping</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Rapid stepping &amp;

-     showing ‘toString()’</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Hot keys</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Step filters [Could add

-     tests to test suite]</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Primitive display options

-     (preferences in java-&gt; debug -&gt; appearance)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Filter options (preferences

-     java -&gt; debug -&gt; appearance)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Suspending a running

-     program</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Stepping in non-top stack

-     frame</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Stepping “thru” breakpoints

-     – i.e. should hit breakpoints when stepping over code with breakpoints</li>

-</ul>

-

-<h2>Presentation</h2>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>All action labels in all

-     menus</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>All tool tips in toolbars</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>F1 help in all views</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>Debug Action groups (turn

-     on/off)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>Debug keyboard navigation</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>Remembering user settings:

-     prefs, action states etc.</li>

-</ul>

-

-<h2>Memory Leak</h2>

-

-<p>Use &quot;optimize it&quot; to ensure that we free allocated memory for the

-following tasks:</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Start/kill debug session</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Open/close snippet editor

-     (and start an evaluation)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Open close preference pages,

-     views and dialogs</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Open/close perspective</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Evaluations in debugger</li>

-</ul>

-

-</div>

-

-</body>

-

-</html>

diff --git a/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java b/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
deleted file mode 100644
index 38fe47f..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class ArgumentsTests {
-	public static void nop() {
-		// used to allow breakpoint on otherwise empty lines
-	}
-	
-	public static void simpleTest(Object obj) {
-		nop();	// should see obj
-	}
-	
-	// Tests recursion (multiple stack frames for the same method with different variable values)
-	public static int fact(int n) {
-		if (n == 0 || n == 1)
-			return 1;
-		else
-			return n*fact(n-1);
-	}
-	
-	public static void main(String[] args) {
-		simpleTest(null);
-		fact(2);
-	}	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java b/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
deleted file mode 100644
index 4779f34..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
+++ /dev/null
@@ -1,161 +0,0 @@
-import java.util.*;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class Breakpoints implements IBreakpoints {
-	static {
-	 	new Vector(1);
-	 	System.out.println("Initializer");
-    }
-
-    public class InnerBreakpoints {
-    	public void innerInstanceMethod() {
-    		System.out.println("inner instance");
-    	}
-    }
-
-        Enumeration myNamedEnumerate(final Object array[]) {
-        	final int count[] = {0}; // final reference to mutable array
-        	class E implements Enumeration {
-           	 public boolean hasMoreElements(){
-           	 	 return count[0] < array.length;
-           	 }
-           	 public Object nextElement(){
-           	 	 return array[count[0]++];
-           	 }
-        	}
-        	return new E();
-        }
-
-	    Enumeration myAnonymousEnumerate(final Object array[]) {
-    	    return new Enumeration() {
-        	    int count = 0;
-           		 public boolean hasMoreElements(){
-           	 		 return count < array.length;
-           	 	}
-           	 	public Object nextElement(){
-           	 		 return array[count++];
-           	 	}
-        	};
-    	}
-
- public static void main (String[] args) {
- 	threading();
-	Breakpoints bp= new Breakpoints();
-	bp.instanceMethod();
-	bp.instanceMethod2();
-
- }
-
-public class InnerRunnable implements Runnable {
-  	public void run() {
-  		System.out.println("Threading");
-  	}
- }
- public static boolean threading() {
- 	try {
- 		Thread runner = new Thread(new Breakpoints().new InnerRunnable(), "BreakpointsThread");
-		runner.setPriority(Thread.MIN_PRIORITY);
-		runner.start();
-		runner.join();
-	} catch (InterruptedException ie) {
-	}
-	return false;
- }
-
- public Breakpoints() {
- 	super();
- 	System.out.println("Constructor");
- }
- public void instanceMethod() {
- 	if (true) {
- 		System.out.println("If");
- 	} else {
- 		System.out.println("Can't get here");
- 	}
- 	if (false) {
- 		System.out.println("Can't get here");
- 	} else {
- 		System.out.println("Else");
- 	}
-
- 	int i;
- 	for (i= 0; i < 3; i++) {
- 		System.out.println("for");
- 	}
-
- 	while (i < 6) {
- 		System.out.println("while");
- 		i++;
- 	}
-
- 	{
- 		System.out.println("block");
- 	}
- }
-
-  public void instanceMethod2() {
-  	int count= 0;
-  	do {
-		System.out.println("dowhile");
-		count++;
-	} while (count < 5);
-
-
-	try {
-			Vector v= new Vector(1);
-			v.firstElement();
-		} catch (NoSuchElementException nsee) {
-			System.out.println("catch block");
-		} finally {
-			System.out.println("finally after catch");
-
-	}
-	try {
-			new Vector(1);
-			System.out.println("try");
-		} catch (NoSuchElementException nsee) {
-		} finally {
-			System.out.println("finally after try");
-
-	}
-	switch (count) {
-		case 5:
-		System.out.println("switch");
-		break;
-	}
-		switch (count) {
-		case 3:
-		break;
-		default:
-		System.out.println("switch default");
-	}
-
-
-  	Object lock= new Object();
-  	synchronized (lock) {
-  		System.out.println("synchronized");
-  	}
-
-	InnerBreakpoints ibp= new InnerBreakpoints();
-	ibp.innerInstanceMethod();
-
-	String[] array= {"1", "2", "3"};
-	Enumeration myNamed= myNamedEnumerate(array);
-	myNamed.hasMoreElements();
-
-	Enumeration myAnonymous= myAnonymousEnumerate(array);
-	myAnonymous.hasMoreElements();
-
-	ibp.innerInstanceMethod();
-  }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/CompileError.java b/org.eclipse.jdt.debug.tests/testprograms/CompileError.java
deleted file mode 100644
index 0c7b80d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/CompileError.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class CompileError {
-
-	// This is a place-holder file.  The tests will programmatically change the 
-	// content of this file to contain a compilation error
-	public static void main(String[] args) {
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/DropTests.java b/org.eclipse.jdt.debug.tests/testprograms/DropTests.java
deleted file mode 100644
index dc50b00..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/DropTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class DropTests {
- 
- 	public static void main(String[] args) {
- 		DropTests dt = new DropTests();
- 		dt.method1();
- 	}
- 
- 	public void method1() {
- 		method2();
- 	}
- 	
- 	public void method2() {
- 		method3();
- 	}
- 	
- 	public void method3() {
- 		method4();
- 	}
- 	
- 	public void method4() {
- 		System.out.println("Finally, I got to method 4");
- 	}
- 
- }
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
deleted file mode 100644
index 1c98cda..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class EvalArrayTests {
-	
-	public static void main(String[] args) {
-		byte[] xArrayByte = new byte[]{1, 2, 3};
-		char[] xArrayChar = new char[]{1, 2, 3};
-		short[] xArrayShort = new short[]{1, 2, 3};
-		int[] xArrayInt = new int[]{1, 2, 3};
-		long[] xArrayLong = new long[]{1, 2, 3};
-		float[] xArrayFloat = new float[]{(float)1.2, (float)2.3, (float)3.4};
-		double[] xArrayDouble = new double[]{1.2, 2.3, 3.4};
-		String[] xArrayString = new String[]{"one", "two", "three"};
-		boolean[] xArrayBoolean = new boolean[]{true, false, true};
-
-		byte[] yArrayByte = new byte[]{7, 8, 9};
-		char[] yArrayChar = new char[]{7, 8, 9};
-		short[] yArrayShort = new short[]{7, 8, 9};
-		int[] yArrayInt = new int[]{7, 8, 9};
-		long[] yArrayLong = new long[]{7, 8, 9};
-		float[] yArrayFloat = new float[]{(float)7.6, (float)8.7, (float)9.8};
-		double[] yArrayDouble = new double[]{7.6, 8.7, 9.8};
-		String[] yArrayString = new String[]{"seven", "eight", "nine"};
-		boolean[] yArrayBoolean = new boolean[]{false, true, false};
-		
-		int[][] intArray = new int[][] {{1,2,3},{4,5,6},{7,8,9}};
-		
-		System.out.println("tests ...");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
deleted file mode 100644
index b9fd274..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class EvalNestedTypeTests {
-	
-	int a= 1;
-	String aa= "one";
-	
-	static int b= 2;
-	static String bb= "two";
-	
-	int c= 3;
-	String cc= "three";
-	
-	static int d= 4;
-	static String dd= "four";
-	
-	int e= 5;
-	String ee= "five";
-	
-	static int f= 6;
-	static String ff= "six";
-
-	static class A {
-		int g= 7;
-		String gg= "seven";
-		
-		static int h= 8;
-		static String hh= "eight";
-		
-		int c= 37;
-		String cc= "three seven";
-		
-		static int d= 48;
-		static String dd= "four eight";
-		
-		static class AA {
-			int i= 9;
-			String ii= "nine";
-			
-			static int j= 0;
-			static String jj= "zero";
-			
-			int c= 379;
-			String cc= "three seven nine";
-			
-			static int d= 480;
-			static String dd= "four eight zero";
-			
-			int e= 59;
-			String ee= "five nine";
-			
-			static int f= 60;
-			static String ff= "six zero";
-			
-			void aa() {
-				System.out.println("Tests ...");
-			}
-				
-			static void aaStatic() {
-				System.out.println("Tests ...");
-			}
-				
-		}
-		
-		class AB {
-			int i= 9;
-			String ii= "nine";
-			
-			final static int j= 0;
-			final static String jj= "zero";
-			
-			int c= 379;
-			String cc= "three seven nine";
-			
-			final static int d= 480;
-			final static String dd= "four eight zero";
-			
-			int e= 59;
-			String ee= "five nine";
-			
-			final static int f= 60;
-			final static String ff= "six zero";
-			
-			void ab() {
-				System.out.println("Tests ...");
-			}
-
-		}
-		
-		void a() {
-			class AC {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void ac() {
-					System.out.println("Tests ...");
-					g = g;
-				}
-			}
-			
-			Runnable i_ad= new Runnable() {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				public void run() {
-					System.out.println("Tests ...");
-					g = g;
-				}
-			};
-			AB i_ab= new AB();
-			i_ab.ab();
-			AC i_ac= new AC();
-			i_ac.ac();
-			i_ad.run();
-			
-			System.out.println("Tests ...");
-		}
-		
-		static void aStatic() {
-			class AE {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void ae() {
-					System.out.println("Tests ...");
-				}
-			}
-			
-			Runnable i_af= new Runnable() {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				public void run() {
-					System.out.println("Tests ...");
-				}
-			};
-			
-			AA i_aa= new AA();
-			i_aa.aa();
-			AA.aaStatic();
-			AE i_ae= new AE();
-			i_ae.ae();
-			i_af.run();
-			
-			System.out.println("Tests ...");
-		}
-			
-	}
-
-	class B {
-		int g= 7;
-		String gg= "seven";
-		
-		final static int h= 8;
-		final static String hh= "eight";
-		
-		int c= 37;
-		String cc= "three seven";
-		
-		final static int d= 48;
-		final static String dd= "four eight";
-		
-		class BB {
-			int i= 9;
-			String ii= "nine";
-			
-			final static int j= 0;
-			final static String jj= "zero";
-			
-			int c= 379;
-			String cc= "three seven nine";
-			
-			final static int d= 480;
-			final static String dd= "four eight zero";
-			
-			int e= 59;
-			String ee= "five nine";
-			
-			final static int f= 60;
-			final static String ff= "six zero";
-			
-			void bb() {
-				System.out.println("Tests ...");
-				g = g;
-			}
-			
-		}
-		
-		void b() {
-			class BC {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void bc() {
-					System.out.println("Tests ...");
-					g = g;
-				}
-			}
-			
-			Runnable i_bd= new Runnable() {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				public void run() {
-					System.out.println("Tests ...");
-					g = g;
-				}
-			};
-			
-			BB i_bb= new BB();
-			i_bb.bb();
-			BC i_bc= new BC();
-			i_bc.bc();
-			i_bd.run();
-
-			System.out.println("Tests ...");
-			a = a;
-		}
-	}
-	
-	void evalNestedTypeTest() {
-		class C {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class CB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void cb() {
-					System.out.println("Tests ...");
-					a = a;
-				}
-	
-			}
-			
-			void c() {
-				class CC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void cc() {
-						System.out.println("Tests ...");
-						a = a;
-					}
-				}
-				
-				Runnable i_cd= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-						a = a;
-					}
-				};
-				
-				CB i_cb= new CB();
-				i_cb.cb();
-				CC i_cc= new CC();
-				i_cc.cc();
-				i_cd.run();
-
-				System.out.println("Tests ...");
-			}
-							
-		}
-	
-		Runnable i_d= new Runnable() {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class DB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void db() {
-					System.out.println("Tests ...");
-					a = a;
-				}
-			}
-			
-			public void run() {
-				class DC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void dc() {
-						System.out.println("Tests ...");
-						a = a;
-					}
-				}
-				
-				Runnable i_dd= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-						a = a;
-					}
-				};
-				
-				DB i_db= new DB();
-				i_db.db();
-				DC i_dc= new DC();
-				i_dc.dc();
-				i_dd.run();
-
-				System.out.println("Tests ...");
-			}
-		};
-		
-		B i_b= new B();
-		B.BB i_bb= i_b.new BB();
-		i_b.b();
-		C i_c= new C();
-		C.CB i_cb= i_c.new CB();
-		i_c.c();
-		i_d.run();
-		
-		System.out.println("Tests ...");
-	}
-
-	static void evalNestedTypeTestStatic() {
-		class E {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class EB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void eb() {
-					System.out.println("Tests ...");
-				}
-	
-			}
-			
-			void e() {
-				class EC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void ec() {
-						System.out.println("Tests ...");
-					}
-				}
-				
-				Runnable i_ed= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-					}
-				};
-				
-				EB i_eb= new EB();
-				i_eb.eb();
-				EC i_ec= new EC();
-				i_ec.ec();
-				i_ed.run();
-
-				System.out.println("Tests ...");
-			}
-							
-		}
-	
-		Runnable i_f= new Runnable() {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class FB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void fb() {
-					System.out.println("Tests ...");
-				}
-	
-			}
-			
-			public void run() {
-				class FC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void fc() {
-						System.out.println("Tests ...");
-					}
-				}
-				
-				Runnable i_fd= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-					}
-				};
-				
-				FB i_fb= new FB();
-				i_fb.fb();
-				FC i_fc= new FC();
-				i_fc.fc();
-				i_fd.run();
-
-				System.out.println("Tests ...");
-			}
-		};
-		
-		A i_a= new A();
-		i_a.a();
-		A.aStatic();
-		A.AA i_aa= new A.AA();
-		A.AB i_ab= i_a.new AB();
-		
-		E i_e= new E();
-		E.EB i_eb= i_e.new EB();
-		i_e.e();
-		i_f.run();
-		
-		System.out.println("Tests ...");
-	}
-
-	public static void main(String[] args) {
-		new EvalNestedTypeTests().evalNestedTypeTest();
-		EvalNestedTypeTests.evalNestedTypeTestStatic();
-		System.out.println("Tests ...");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
deleted file mode 100644
index d4c15b2..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class EvalSimpleTests {
-	
-	public static void main(String[] args) {
-		byte xVarByte = -5;
-		char xVarChar = (char)-5;
-		short xVarShort = -5;
-		int xVarInt = -5;
-		long xVarLong = -5;
-		float xVarFloat = (float)-5.3;
-		double xVarDouble = -5.3;
-		String xVarString = "minus five";
-		boolean xVarBoolean = true;
-//		Object xVarNull = null;
-
-		byte yVarByte = 7;
-		char yVarChar = 7;
-		short yVarShort = 7;
-		int yVarInt = 7;
-		long yVarLong = 7;
-		float yVarFloat = (float)6.9;
-		double yVarDouble = 6.9;
-		String yVarString = "seven";
-		boolean yVarBoolean = false;
-//		Object yVarNull = null;
-		
-		System.out.println("tests ...");
-	}//3+3
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
deleted file mode 100644
index f0965c3..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class EvalTypeHierarchyTests {
-	
-	interface I_A {
-		int m1();
-	}
-	
-	static class A implements I_A {
-		public int m1() {
-			return 1;
-		}
-		
-		public int m2() {
-			return 2;
-		}
-		
-		public static int s2() {
-			return 9;
-		}
-		
-		public void testA() {
-			System.out.println("test");
-		}
-	}
-	
-	interface I_B extends I_A {
-		int m1();
-		
-		int m3();
-	}
-	
-	static class B extends A implements I_B {
-		public int m1() {
-			return 11;
-		}
-		
-		public int m2() {
-			return 22;
-		}
-
-		public static int s2() {
-			return 99;
-		}
-		
-		public int m3() {
-			return 33;
-		}
-		
-		public int m4() {
-			return 44;
-		}
-
-		public static int s4() {
-			return 88;
-		}
-		
-		public void testB() {
-			System.out.println("test");
-		}
-	}
-	
-	interface I_C extends I_B {
-		int m1();
-		
-		int m3();
-		
-		int m5();
-	}
-	
-	static class C extends B implements I_C {
-		
-		public int m1() {
-			return 111;
-		}
-		
-		public int m2() {
-			return 222;
-		}
-
-		public static int s2() {
-			return 999;
-		}
-		
-		public int m3() {
-			return 333;
-		}
-		
-		public int m4() {
-			return 444;
-		}
-
-		public static int s4() {
-			return 888;
-		}
-		
-		public int m5() {
-			return 555;
-		}
-		
-		public int m6() {
-			return 666;
-		}
-		
-		public static int s6() {
-			return 777;
-		}
-		
-		public void testC() {
-			System.out.println("test");
-		}
-	}
-	
-	public static void main(String[] args) {
-		I_A iaa= new A();
-		I_A iab= new B();
-		I_A iac= new C();
-		A aa= new A();
-		A ab= new B();
-		A ac= new C();
-		I_B ibb= new B();
-		I_B ibc= new C();
-		B bb= new B();
-		B bc= new C();
-		I_C icc= new C();
-		C cc= new C();
-		aa.testA();
-		ab.testA();
-		ac.testA();
-		bb.testA();
-		bb.testB();
-		bc.testA();
-		bc.testB();
-		cc.testA();
-		cc.testB();
-		cc.testC();
-		System.out.println("test");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
deleted file mode 100644
index 147ec3f..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class EvalTypeTests {
-	
-	byte xFieldByte = -2;
-	char xFieldChar = (char)-2;
-	short xFieldShort = -2;
-	int xFieldInt = -2;
-	long xFieldLong = -2;
-	float xFieldFloat = (float)-2.1;
-	double xFieldDouble = -2.1;
-	String xFieldString = "minus two";
-	boolean xFieldBoolean = true;
-
-	byte yFieldByte = 9;
-	char yFieldChar = 9;
-	short yFieldShort = 9;
-	int yFieldInt = 9;
-	long yFieldLong = 9;
-	float yFieldFloat = (float)8.6;
-	double yFieldDouble = 8.6;
-	String yFieldString = "nine";
-	boolean yFieldBoolean = false;
-
-	static byte xStaticFieldByte = -1;
-	static char xStaticFieldChar = (char)-1;
-	static short xStaticFieldShort = -1;
-	static int xStaticFieldInt = -1;
-	static long xStaticFieldLong = -1;
-	static float xStaticFieldFloat = (float)-1.5;
-	static double xStaticFieldDouble = -1.5;
-	static String xStaticFieldString = "minus one";
-	static boolean xStaticFieldBoolean = true;
-
-	static byte yStaticFieldByte = 6;
-	static char yStaticFieldChar = 6;
-	static short yStaticFieldShort = 6;
-	static int yStaticFieldInt = 6;
-	static long yStaticFieldLong = 6;
-	static float yStaticFieldFloat = (float)6.5;
-	static double yStaticFieldDouble = 6.5;
-	static String yStaticFieldString = "six";
-	static boolean yStaticFieldBoolean = false;
-
-	void test1() {
-		System.out.println("Test1 ...");
-	}
-
-	static void test2() {
-		System.out.println("Test2 ...");
-	}
-	
-	void bar() {
-		System.out.println("Tests ...");
-	}
-
-	static void foo() {
-		System.out.println("Tests ...");
-	}
-	
-	public static void main(String[] args) {
-		EvalTypeTests foo = new EvalTypeTests();
-		
-		System.out.println("Tests ...");
-		
-		foo.bar();
-		
-		foo();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
deleted file mode 100644
index 4a5d638..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-import java.util.Date;
-import java.util.Vector;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class EvaluationTests {
-
-	protected int fInt= 5;
-	protected String fString= "testing";
-	protected static final String CONSTANT= "constant";
-	private Date fADate= new Date();
-
-	public static void main(java.lang.String[] args) {
-		EvaluationTests tests= new EvaluationTests(); //line 12
-		tests.method();
-	}
-
-	public void method() {
-		System.out.println(returnInt());
-		System.out.println(returnDate());
-		int x= 5; //line 19
-		System.out.println(x);
-		Vector v= new Vector();
-		v.isEmpty();
-	}
-
-	public int returnInt() {
-		return 7;
-	}
-
-	public Date returnDate() {
-		return new Date();
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java b/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
deleted file mode 100644
index cd7318d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class GotNewName {
-
-	public static void main(String[] args) {
-		GotNewName anObject = new GotNewName();
-
-		try {
-			anObject.throwBaby();
-		} catch(NullPointerException ne) {
-			// do nothing
-		}
-
-		anObject.killTime();
-
-		try {
-			anObject.throwBaby();
-		} catch(NullPointerException ne) {
-			// do nothing
-		}
-
-		try {
-			anObject.throwAnotherBaby();
-		} catch(IllegalArgumentException ie) {
-			// do nothing
-		}
-	}
-
-	public void throwBaby() {
-		throw new NullPointerException();
-	}
-
-	public void throwAnotherBaby() {
-		throw new IllegalArgumentException();
-	}
-
-	public void killTime() {
-		int j = 0;
-		while(j < 1000) {
-			j++;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java b/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
deleted file mode 100644
index a8bdb4d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-import java.util.Vector;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HitCountException {
-
-	public static void main(String[] args) {
-		HitCountException mte = new HitCountException();
-		mte.go();
-	}
-	
-	private void go() {
-		try {
-			generateNPE();
-		} catch (NullPointerException npe) {
-		}
-		
-		generateNPE();
-	}
-	
-	void generateNPE() {
-		Vector vector = null;
-		if (1 > 2) {
-			vector = new Vector();
-		}
-		vector.add("item");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java b/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
deleted file mode 100644
index ec9ffb8..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HitCountLooper {
-	public static void main(String[] args) {
-		int i = 0;
-		while (i < 20) {
-			System.out.println("Main Looping " + i);
-			i++;
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java b/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
deleted file mode 100644
index e858a98..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public interface IBreakpoints {
-	 public abstract void instanceMethod();
- }
diff --git a/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
deleted file mode 100644
index 0290e0e..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-import java.util.Date;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class InstanceVariablesTests {
-	public void nop() {
-	}
-	
-	public InstanceVariablesTests() {
-		nop(); // should see this.*Str with correct values
-	}
-
-	public static void main(String[] args) {
-		InstanceVariablesTests ivt = new InstanceVariablesTests();
-		ivt.run();
-	}
-	
-	public void run() {
-		nop(); // should see this
-		InstanceVariablesTests ivt = new IVTSubclass();
-		ivt.run();
-	}
-	
-	public String pubStr = "public";
-	protected String protStr = "protected";
-	/* default */ String defStr = "default";
-	private String privStr = "private";
-	protected String nullStr= null;
-	protected Date date= new Date();
-	protected Date nullDate= null;
-}
-
-class IVTSubclass extends InstanceVariablesTests {
-	public void run() {
-		nop();
-	}
-	
-	public String pubStr = "redefined public";
-	protected String protStr = "redefined protected";
-	/* default */ String defStr = "redefined default";
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
deleted file mode 100644
index 81971fd..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class LocalVariablesTests {
-	public static void nop() {
-		// used to allow breakpoint on otherwise empty lines
-	}
-	
-	public static void simpleTest() {
-		nop(); // should see no local variables here
-		int i1 = 0;
-		nop(); // should see 1 local variable: i1
-		int i2 = 1;
-		nop(); // should see 2 local variables: i1 && i2
-	}
-
-	public static void outerMethod() {
-		int i1 = 0;
-		innerMethod();
-		// i1 visible and i1==0, i2 not visible
-		int i2 = 1;
-		nop();
-	}
-
-	public static void innerMethod() {
-		int i2 = 7;
-		nop(); // i1 not visible in the top stack frame, i2 visible
-	}
-	
-	public static void testFor() {
-		nop(); // should see no variable
-		for (int i = 0; i < 1; i++) {
-			nop(); // should see i
-			for (int j = 0; j < 1; j++) {
-				nop(); // 	should see i, j
-				Object obj = null;
-				nop(); // should see i, j, obj
-				obj = "foo";
-			}
-		}
-		nop(); // should not see i and j
-	}
-	
-	public static void testIf(boolean cond) {
-		if (cond) {
-			Object ifObj = new String("true");
-			nop();
-		} else {
-			Object elseObj = new String("false");
-			nop();
-		}
-		nop();
-	}
-	
-	public static void testWhile() {
-		int i = 0;
-		while (i < 1) {
-			int j = i/2;
-			nop(); // should see i & j
-			i++;
-		}
-	}
-	
-	public static void testTryCatch() {
-		try {
-			String str = null;
-			nop(); // should see str
-			str.length();
-		} catch (NullPointerException ex) {
-			nop(); // should see ex
- 		} finally {
- 			nop(); // should see str
- 		}
-	}
-	
-	public static void testAliasing() {
-		String str1 = new String("value");
-		String str2 = str1;
-		nop();
-	}
-
-	public static void main(String[] args) {
-		simpleTest();  // @see LocalVariablesTests.testSimple()
-		outerMethod(); // @see LocalVariablesTests.testMethodCall()
-		testFor();    // @see LocalVariablesTests.testFor()
-		testIf(true);  // @see LocalVariablesTests.testIf()
-		testIf(false); // @see LocalVariablesTests.testIf()
-		testWhile();   // @see LocalVariablesTests.testWhile()
-		testTryCatch();// @see LocalVariablesTests.testTryCatch()
-		testAliasing(); // @see LocalVariablesTests.testAliasing()
-
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java b/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
deleted file mode 100644
index 16e180a..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import java.lang.reflect.Method;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class MethodEntryRunner {
-
-	// Why the reflection?  Because this class fires up a class that is meant to exist only as 
-	// a .class file in the tests, and MethodEntryRunner wouldn't compile in
-	// development if we directly invoked MethodEntryTest, since there's no source for it
-	public static void main(java.lang.String[] args) {
-		try {
-			Class clazz= Class.forName("MethodEntryTest");
-			Method method= clazz.getMethod("main", new Class[] {String[].class});
-			method.invoke(null, new Object[] { new String[] {} } );
-		} catch (Exception ex) {
-			System.err.println("Exception trying to invoke MethodEntryTest");
-			ex.printStackTrace();
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java b/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
deleted file mode 100644
index d96d73d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class MethodLoop {
-	
-	private int i;
-	private int sum = 0;
-
-	public static void main(String[] args) {
-		MethodLoop ml = new MethodLoop();
-		ml.go();
-	}
-	
-	public void go() {
-		for (i = 1; i < 10; i++) {
-			calculateSum();
-		}
-	}
-	
-	protected void calculateSum() {
-		sum += i;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java b/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
deleted file mode 100644
index e942cdc..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-import java.util.Vector;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class MultiThreadedException {
-
-	public static void main(String[] args) {
-		MultiThreadedException mte = new MultiThreadedException();
-		mte.go();
-	}
-	
-	private void go() {
-		Thread.currentThread().setName("1stThread");
-		
-		Thread secondThread = new Thread(new Runnable() {
-			public void run() {
-				generateNPE();
-			}
-		});
-		secondThread.setName("2ndThread");
-		secondThread.start();
-		
-		try {
-			Thread.sleep(1000);
-		} catch (InterruptedException e) {
-		}
-		
-		generateNPE();
-	}
-	
-	void generateNPE() {
-		Vector vector = null;
-		if (1 > 2) {
-			vector = new Vector();
-		}
-		vector.add("item");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java b/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
deleted file mode 100644
index 6531af0..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
+++ /dev/null
@@ -1,53 +0,0 @@
-import java.util.ArrayList;
-import java.util.List;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class MultiThreadedList {
-
-	int i = 0;
-	List list = new ArrayList();
-
-	public static void main(String[] args) {
-		MultiThreadedList mtl = new MultiThreadedList();
-		Thread.currentThread().setName("1stThread");
-		mtl.go();
-	}
-	
-	protected void go() {
-		Thread secondThread = new Thread(new Runnable() {
-			public void run() {
-				listLoop();
-			}
-		});
-		secondThread.setName("2ndThread");
-		secondThread.start();
-		
-		try {
-			Thread.sleep(400);
-		} catch (InterruptedException e) {
-		}
-		
-		listLoop();
-	}
-	
-	private void listLoop() {
-		while (i < 20) {
-			list.add(new Integer(i++));
-			System.out.println("Size = " + list.size());
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java b/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
deleted file mode 100644
index 51272fb..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class MultiThreadedLoop {
-
-	public static void main(String[] args) {
-		MultiThreadedLoop mtl = new MultiThreadedLoop();
-		Thread.currentThread().setName("1stThread");
-		mtl.go();
-	}
-	
-	protected void go() {
-		Thread secondThread = new Thread(new Runnable() {
-			public void run() {
-				loop();
-			}
-		});
-		secondThread.setName("2ndThread");
-		secondThread.start();
-		
-		try {
-			Thread.sleep(400);
-		} catch (InterruptedException e) {
-		}
-		
-		loop();
-	}
-	
-	private void loop() {
-		int i = 0;
-		while (i < 20) {
-			System.out.println("Thread: " + Thread.currentThread().getName() + " loop #" + i++); 
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java b/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
deleted file mode 100644
index b50ef92..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class NativeDropTests {
-	public static void foo() {
-		System.out.println("foo"); 
-		System.out.println("breakpoint"); // breakpoint on this line
-	}
-	
-	public static void bar() {
-		foo();
-	}
-
-	public static void main(String[] args) throws Exception {
-		Class clazz = NativeDropTests.class;
-		java.lang.reflect.Method method = clazz.getMethod("bar", new Class[] {});
-		method.invoke(null, new Object[] {});
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
deleted file mode 100644
index 1fea76d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class StaticVariablesTests {
-	
-	private int i;
-	private String s;
-	
-	public StaticVariablesTests() {
-		i = 1;
-		s = "string";	
-	}
-	
-	public static void nop() {
-	}
-	
-	public static String pubStr = "public";
-	protected static String protStr = "protected";
-	/* default */ static String defStr = "default";
-	private static String privStr = "private";	
- 		
-	public static void run() {
-		nop();
-	}
-	
-	public int fcn() {
-		return 1;	
-	}
-	
-	public static void main(String[] args) {
-		run();
-		(new StaticVariablesTests()).fcn();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
deleted file mode 100644
index c084729..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class StepFilterOne {
-
-	public static void main(String[] args) {
-		StepFilterOne sf1 = new StepFilterOne();
-		sf1.go();
-	}
-	
-	private void go() {
-		StepFilterTwo sf2 = new StepFilterTwo();
-		sf2.test();
-		sf2.go();
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
deleted file mode 100644
index 3ef9a5d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class StepFilterThree {
-
-	public StepFilterThree() {
-		//int i = 0;
-	}
-
-	void go() {
-		System.out.println("StepFilterThree.go()");
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
deleted file mode 100644
index fd66528..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class StepFilterTwo {
-
-	private StepFilterThree sf3;
-
-	public StepFilterTwo() {
-		sf3 = new StepFilterThree();
-	}
-
-	protected void go() {
-		sf3.go();
-	}
-	
-	void test() {
-		System.out.println("StepFilterTwo.test()");
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/TestIO.java b/org.eclipse.jdt.debug.tests/testprograms/TestIO.java
deleted file mode 100644
index c3fd0dd..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/TestIO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import java.io.*;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class TestIO {
-	
-	public static void main(String[] args) {
-		TestIO tio = new TestIO();
-		try {
-			tio.testBaby();
-		} catch (EOFException e) {
-		}
-	}
-
-	public void testBaby() throws EOFException {
-		throw new EOFException("test");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java b/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
deleted file mode 100644
index 766c4fe..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class ThrowsNPE {
-	
-	public static void main(String[] args) {
-		ThrowsNPE anObject = new ThrowsNPE();
-		try {
-			anObject.throwBaby();
-		} catch(NullPointerException ne) {
-			// do nothing
-		}		
-		anObject.throwBaby();
-	}
-
-
-	public void throwBaby() {
-		throw new NullPointerException();
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java b/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
deleted file mode 100644
index b9f831c..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class WorkingDirectoryTest {
-
-	public static void main(String[] args) {
-		String dir = System.getProperty("user.dir");
-		System.out.println(dir);
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
deleted file mode 100644
index 75830e0..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class CallLoop {
-	public static void main(String[] args) {
-		(new Looper()).loop();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
deleted file mode 100644
index 8d82ede..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HelloLauncher {
-	public static void main(String args[]) {
-		for (int i = 0; i < 10; i++) {
-			System.out.println("Hello Launcher");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
deleted file mode 100644
index 609b0ad..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HelloLauncherWithArg {
-	public static void main(String args[]) {
-		int argCount = args.length;
-		if (argCount > 0) {
-			if (args[0].equals("foo")) {
-				System.out.println("First argument was foo");
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
deleted file mode 100644
index b9404b9..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HelloLauncherWithArgs {
-	public static void main(String args[]) {
-		int argCount = args.length;
-		if (argCount > 1) {
-			if (args[0].equals("foo") && args[1].equals("bar")) {
-				System.out.println("First argument was foo and second argument was bar");
-			}
-		}			
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
deleted file mode 100644
index 2e8118e..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HitCountLooper {
-	public static void main(String[] args) {
-		int i = 0;
-		while (i < 20) {
-			System.out.println("Main Looping " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-		(new HitCountLooper()).loop();
-	}
-
-	public void loop() {
-		Runnable r= new Runnable() {
-			public void run() {
-				while (true) {
-					int i = 0;
-					System.out.println("Thread Looping " + i);
-					i++;
-					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-		};
-		new Thread(r).start();
-		int i = 0;
-		while (true) {
-			System.out.println("Instance Looping " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
deleted file mode 100644
index 90c8859..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class InfiniteLoop {
-	public static void main(String[] args) {
-		(new InfiniteLoop()).loop();
-	}
-
-	public void loop() {
-		int i = 0;
-		while (true) {
-			System.out.println("Looping " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
deleted file mode 100644
index ea58341..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class Looper {
-	public void loop() {
-		int i = 0;
-		while (true) {
-			System.out.println("Loop " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
deleted file mode 100644
index 3f6114b..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Watchpoint {
-	
-	public List list;
-	
-	public static void main(String[] args) {
-		Watchpoint wp = new Watchpoint();
-		wp.fillList();
-	}
-	
-	public void fillList() {
-		list = new ArrayList(10);
-		int value = 10;
-		while (value > 0) {
-			list.add(new Integer(value));
-			value--;
-		}
-		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testresources/TestSource.jar b/org.eclipse.jdt.debug.tests/testresources/TestSource.jar
deleted file mode 100644
index 4c0bdf4..0000000
--- a/org.eclipse.jdt.debug.tests/testresources/TestSource.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
deleted file mode 100644
index 96f3ef3..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
deleted file mode 100644
index c4c4de3..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.eclipse.jdt.debug.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.testplugin.TestPluginLauncher;
-import org.eclipse.jdt.debug.tests.core.BootpathTests;
-import org.eclipse.jdt.debug.tests.core.BreakpointListenerTests;
-import org.eclipse.jdt.debug.tests.core.ClasspathProviderTests;
-import org.eclipse.jdt.debug.tests.core.ConditionalBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.DeferredBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.EventSetTests;
-import org.eclipse.jdt.debug.tests.core.ExceptionBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.HitCountBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.InstanceFilterTests;
-import org.eclipse.jdt.debug.tests.core.InstanceVariableTests;
-import org.eclipse.jdt.debug.tests.core.LaunchConfigurationTests;
-import org.eclipse.jdt.debug.tests.core.LocalVariableTests;
-import org.eclipse.jdt.debug.tests.core.MethodBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.MiscBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.PatternBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.ProcessTests;
-import org.eclipse.jdt.debug.tests.core.RuntimeClasspathEntryTests;
-import org.eclipse.jdt.debug.tests.core.SourceLocationTests;
-import org.eclipse.jdt.debug.tests.core.StaticVariableTests;
-import org.eclipse.jdt.debug.tests.core.StepFilterTests;
-import org.eclipse.jdt.debug.tests.core.SuspendVMBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.TargetPatternBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.ThreadFilterBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.TypeTests;
-import org.eclipse.jdt.debug.tests.core.WatchpointTests;
-import org.eclipse.jdt.debug.tests.eval.TestsArrays;
-import org.eclipse.jdt.debug.tests.eval.TestsNestedTypes1;
-import org.eclipse.jdt.debug.tests.eval.TestsNestedTypes2;
-import org.eclipse.jdt.debug.tests.eval.TestsOperators1;
-import org.eclipse.jdt.debug.tests.eval.TestsOperators2;
-import org.eclipse.jdt.debug.tests.eval.TestsTypeHierarchy1;
-import org.eclipse.jdt.debug.tests.eval.TestsTypeHierarchy2;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Test all areas of the JDT Debugger.
- * 
- * To run this test suite:
- * <ol>
- * <li>Create a new Run-time Workbench launch configuration</li>
- * <li>Append "org.eclipse.jdt.debug.tests.AutomatedSuite" to the Program Arguments</li>
- * <li>Set the Application Name to "org.eclipse.jdt.debug.tests.app"</li>
- * <li>Run the launch configuration. Output from the tests will be written to the debug console</li>
- * </ol>
- */
-public class AutomatedSuite extends TestSuite {
-	
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean fTesting = true;
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new AutomatedSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public AutomatedSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.class));
-		addTest(new TestSuite(LaunchConfigurationTests.class));
-		addTest(new TestSuite(DeferredBreakpointTests.class));
-		addTest(new TestSuite(ConditionalBreakpointsTests.class));
-		addTest(new TestSuite(HitCountBreakpointsTests.class));
-		addTest(new TestSuite(ThreadFilterBreakpointsTests.class));
-		addTest(new TestSuite(SuspendVMBreakpointsTests.class));
-
-		addTest(new TestSuite(StepFilterTests.class));
-
-		addTest(new TestSuite(InstanceVariableTests.class));
-		addTest(new TestSuite(LocalVariableTests.class));
-		addTest(new TestSuite(StaticVariableTests.class));
-		addTest(new TestSuite(MethodBreakpointTests.class));
-		addTest(new TestSuite(ExceptionBreakpointTests.class));
-		addTest(new TestSuite(WatchpointTests.class));
-		addTest(new TestSuite(PatternBreakpointTests.class));
-		addTest(new TestSuite(TargetPatternBreakpointTests.class));
-		addTest(new TestSuite(EventSetTests.class));
-		addTest(new TestSuite(RuntimeClasspathEntryTests.class));
-		addTest(new TestSuite(ClasspathProviderTests.class));
-		addTest(new TestSuite(SourceLocationTests.class));
-		addTest(new TestSuite(ProcessTests.class));
-		addTest(new TestSuite(BootpathTests.class));
-		addTest(new TestSuite(TypeTests.class));
-		addTest(new TestSuite(InstanceFilterTests.class));
-		addTest(new TestSuite(BreakpointListenerTests.class));
-		
-		// Evaluation tests
-		addTest(new TestSuite(TestsOperators1.class));
-		addTest(new TestSuite(TestsOperators2.class));
-		addTest(new TestSuite(TestsArrays.class));
-		addTest(new TestSuite(TestsNestedTypes1.class));
-		addTest(new TestSuite(TestsNestedTypes2.class));
-		addTest(new TestSuite(TestsTypeHierarchy1.class));
-		addTest(new TestSuite(TestsTypeHierarchy2.class));
-		
-		addTest(new TestSuite(MiscBreakpointsTests.class));
-	}
-	
-	public static void main(String[] args) {
-		TestPluginLauncher.run(TestPluginLauncher.getLocationFromProperties(), AutomatedSuite.class, args);
-	}		
-
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 * The debug tests cannot be run in the UI thread or the event
-	 * waiter blocks the UI when a resource changes.
-	 */
-	public void run(final TestResult result) {
-		final Display display = Display.getCurrent();
-		Thread thread = null;
-		try {
-			Runnable r = new Runnable() {
-				public void run() {
-					for (Enumeration e= tests(); e.hasMoreElements(); ) {
-				  		if (result.shouldStop() )
-				  			break;
-						Test test= (Test)e.nextElement();
-						runTest(test, result);
-					}					
-					fTesting = false;
-					display.wake();
-				}
-			};
-			thread = new Thread(r);
-			thread.start();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		while (fTesting) {
-			try {
-				if (!display.readAndDispatch())
-					display.sleep();
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}			
-		}		
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
deleted file mode 100644
index 4cedb4b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.debug.tests;
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import org.eclipse.jdt.debug.testplugin.TestPluginLauncher;
-import org.eclipse.jdt.debug.tests.eval.ArrayAllocationTests;
-import org.eclipse.jdt.debug.tests.eval.ArrayAssignementTests;
-import org.eclipse.jdt.debug.tests.eval.ArrayValueTests;
-import org.eclipse.jdt.debug.tests.eval.BooleanAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.BooleanOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.ByteAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.ByteOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.CharAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.CharOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.DoubleAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.DoubleOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.FieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.FloatAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.FloatOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.IntAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.IntOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.LabelTests;
-import org.eclipse.jdt.debug.tests.eval.LocalVarAssignmentTests;
-import org.eclipse.jdt.debug.tests.eval.LocalVarValueTests;
-import org.eclipse.jdt.debug.tests.eval.LongAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.LongOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.LoopTests;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_109;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_134;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_144;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_168;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_192;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_203;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_241;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_268;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_293;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_304;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_343;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_370;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_395;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_406;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_444;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_470;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_495;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_506;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_518;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_54;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_555;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_58;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_581;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_605;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_615;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_653;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_679;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_703;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_713;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_728;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_83;
-import org.eclipse.jdt.debug.tests.eval.NumericTypesCastTests;
-import org.eclipse.jdt.debug.tests.eval.QualifiedFieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.QualifiedStaticFieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.QualifiedStaticFieldValueTests2;
-import org.eclipse.jdt.debug.tests.eval.ShortAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.ShortOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.StaticFieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.StaticFieldValueTests2;
-import org.eclipse.jdt.debug.tests.eval.StringPlusAssignmentOpTests;
-import org.eclipse.jdt.debug.tests.eval.StringPlusOpTests;
-import org.eclipse.jdt.debug.tests.eval.TestsArrays;
-import org.eclipse.jdt.debug.tests.eval.TestsNestedTypes1;
-import org.eclipse.jdt.debug.tests.eval.TestsNestedTypes2;
-import org.eclipse.jdt.debug.tests.eval.TestsNumberLiteral;
-import org.eclipse.jdt.debug.tests.eval.TestsOperators1;
-import org.eclipse.jdt.debug.tests.eval.TestsOperators2;
-import org.eclipse.jdt.debug.tests.eval.TestsTypeHierarchy1;
-import org.eclipse.jdt.debug.tests.eval.TestsTypeHierarchy2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_119_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_146_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_3;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_4;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_5;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_6;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_68_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_68_2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_68_3;
-import org.eclipse.jdt.debug.tests.eval.VariableDeclarationTests;
-import org.eclipse.jdt.debug.tests.eval.XfixOperatorsTests;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Test all areas of the UI.
- */
-public class EvalTestSuite extends TestSuite {
-
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean fTesting = true;
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new EvalTestSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public EvalTestSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.class));
-		// Tests included in the automated suite
-		addTest(new TestSuite(TestsOperators1.class));
-		addTest(new TestSuite(TestsOperators2.class));
-		addTest(new TestSuite(TestsArrays.class));
-		addTest(new TestSuite(TestsNestedTypes1.class));
-		addTest(new TestSuite(TestsNestedTypes2.class));
-		addTest(new TestSuite(TestsTypeHierarchy1.class));
-		addTest(new TestSuite(TestsTypeHierarchy2.class));
-		
-		// Extended evaluation tests
-		addTest(new TestSuite(BooleanOperatorsTests.class));
-		addTest(new TestSuite(ByteOperatorsTests.class));
-		addTest(new TestSuite(CharOperatorsTests.class));
-		addTest(new TestSuite(ShortOperatorsTests.class));
-		addTest(new TestSuite(IntOperatorsTests.class));
-		addTest(new TestSuite(LongOperatorsTests.class));
-		addTest(new TestSuite(FloatOperatorsTests.class));
-		addTest(new TestSuite(DoubleOperatorsTests.class));
-		addTest(new TestSuite(StringPlusOpTests.class));
-
-		addTest(new TestSuite(LocalVarValueTests.class));
-		addTest(new TestSuite(LocalVarAssignmentTests.class));
-
-		addTest(new TestSuite(BooleanAssignmentOperatorsTests.class));
-		addTest(new TestSuite(ByteAssignmentOperatorsTests.class));
-		addTest(new TestSuite(CharAssignmentOperatorsTests.class));
-		addTest(new TestSuite(ShortAssignmentOperatorsTests.class));
-		addTest(new TestSuite(IntAssignmentOperatorsTests.class));
-		addTest(new TestSuite(LongAssignmentOperatorsTests.class));
-		addTest(new TestSuite(FloatAssignmentOperatorsTests.class));
-		addTest(new TestSuite(DoubleAssignmentOperatorsTests.class));
-		addTest(new TestSuite(StringPlusAssignmentOpTests.class));
-
-		addTest(new TestSuite(XfixOperatorsTests.class));
-
-		addTest(new TestSuite(NumericTypesCastTests.class));
-
-		addTest(new TestSuite(FieldValueTests.class));
-		addTest(new TestSuite(QualifiedFieldValueTests.class));
-		addTest(new TestSuite(StaticFieldValueTests.class));
-		addTest(new TestSuite(StaticFieldValueTests2.class));
-		addTest(new TestSuite(QualifiedStaticFieldValueTests.class));
-		addTest(new TestSuite(QualifiedStaticFieldValueTests2.class));
-
-		addTest(new TestSuite(ArrayAllocationTests.class));
-		addTest(new TestSuite(ArrayAssignementTests.class));
-		addTest(new TestSuite(ArrayValueTests.class));
-
-		addTest(new TestSuite(NestedTypeFieldValue_54.class));
-		addTest(new TestSuite(NestedTypeFieldValue_58.class));
-		addTest(new TestSuite(NestedTypeFieldValue_83.class));
-		addTest(new TestSuite(NestedTypeFieldValue_109.class));
-		addTest(new TestSuite(NestedTypeFieldValue_134.class));
-		addTest(new TestSuite(NestedTypeFieldValue_144.class));
-		addTest(new TestSuite(NestedTypeFieldValue_168.class));
-		addTest(new TestSuite(NestedTypeFieldValue_192.class));
-		addTest(new TestSuite(NestedTypeFieldValue_203.class));
-		addTest(new TestSuite(NestedTypeFieldValue_241.class));
-		addTest(new TestSuite(NestedTypeFieldValue_268.class));
-		addTest(new TestSuite(NestedTypeFieldValue_293.class));
-		addTest(new TestSuite(NestedTypeFieldValue_304.class));
-		addTest(new TestSuite(NestedTypeFieldValue_343.class));
-		addTest(new TestSuite(NestedTypeFieldValue_370.class));
-		addTest(new TestSuite(NestedTypeFieldValue_395.class));
-		addTest(new TestSuite(NestedTypeFieldValue_406.class));
-		addTest(new TestSuite(NestedTypeFieldValue_444.class));
-		addTest(new TestSuite(NestedTypeFieldValue_470.class));
-		addTest(new TestSuite(NestedTypeFieldValue_495.class));
-		addTest(new TestSuite(NestedTypeFieldValue_506.class));
-		addTest(new TestSuite(NestedTypeFieldValue_518.class));
-		addTest(new TestSuite(NestedTypeFieldValue_555.class));
-		addTest(new TestSuite(NestedTypeFieldValue_581.class));
-		addTest(new TestSuite(NestedTypeFieldValue_605.class));
-		addTest(new TestSuite(NestedTypeFieldValue_615.class));
-		addTest(new TestSuite(NestedTypeFieldValue_653.class));
-		addTest(new TestSuite(NestedTypeFieldValue_679.class));
-		addTest(new TestSuite(NestedTypeFieldValue_703.class));
-		addTest(new TestSuite(NestedTypeFieldValue_713.class));
-		addTest(new TestSuite(NestedTypeFieldValue_728.class));
-
-		addTest(new TestSuite(TypeHierarchy_32_1.class));
-		addTest(new TestSuite(TypeHierarchy_32_2.class));
-		addTest(new TestSuite(TypeHierarchy_32_3.class));
-		addTest(new TestSuite(TypeHierarchy_32_4.class));
-		addTest(new TestSuite(TypeHierarchy_32_5.class));
-		addTest(new TestSuite(TypeHierarchy_32_6.class));
-		addTest(new TestSuite(TypeHierarchy_68_1.class));
-		addTest(new TestSuite(TypeHierarchy_68_2.class));
-		addTest(new TestSuite(TypeHierarchy_68_3.class));
-		addTest(new TestSuite(TypeHierarchy_119_1.class));
-		addTest(new TestSuite(TypeHierarchy_146_1.class));
-		
-		addTest(new TestSuite(TestsNumberLiteral.class));
-
-		addTest(new TestSuite(VariableDeclarationTests.class));
-		addTest(new TestSuite(LoopTests.class));
-		addTest(new TestSuite(LabelTests.class));
-		
-
-	}
-	
-	public static void main(String[] args) {
-		TestPluginLauncher.run(TestPluginLauncher.getLocationFromProperties(), EvalTestSuite.class, args);
-	}		
-
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 * The debug tests cannot be run in the UI thread or the event
-	 * waiter blocks the UI when a resource changes.
-	 */
-	public void run(final TestResult result) {
-		final Display display = Display.getCurrent();
-		Thread thread = null;
-		try {
-			Runnable r = new Runnable() {
-				public void run() {
-					for (Enumeration e= tests(); e.hasMoreElements(); ) {
-				  		if (result.shouldStop() )
-				  			break;
-						runTest((Test)e.nextElement(), result);
-					}					
-					fTesting = false;
-					display.wake();
-				}
-			};
-			thread = new Thread(r);
-			thread.start();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		while (fTesting) {
-			try {
-				if (!display.readAndDispatch())
-					display.sleep();
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}			
-		}		
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
deleted file mode 100644
index b1dc396..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.eclipse.jdt.debug.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Test to close the workbench, since debug tests do not run in the UI
- * thread.
- */
-public class ProjectCreationDecorator extends AbstractDebugTest {
-	
-	public ProjectCreationDecorator(String name) {
-		super(name);
-	}
-	
-	public void testProjectCreation() throws Exception {
-		// delete any pre-existing project
-		IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject("DebugTests");
-		if (pro.exists()) {
-			pro.delete(true, true, null);
-		}
-		// create project and import source
-		fJavaProject = JavaProjectHelper.createJavaProject("DebugTests", "bin");
-		IPackageFragmentRoot src = JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		File root = JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.TEST_SRC_DIR);
-		JavaProjectHelper.importFilesFromDirectory(root, src.getPath(), null);
-		
-		// add rt.jar
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		assertNotNull("No default JRE", vm);
-		JavaProjectHelper.addVariableEntry(fJavaProject, new Path(JavaRuntime.JRELIB_VARIABLE), new Path(JavaRuntime.JRESRC_VARIABLE), new Path(JavaRuntime.JRESRCROOT_VARIABLE));
-		
-		pro = fJavaProject.getProject();
-		
-		//add A.jar
-		root = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testjars"));
-		JavaProjectHelper.importFilesFromDirectory(root, src.getPath(), null);
-		IPath path = src.getPath().append("A.jar");
-		JavaProjectHelper.addLibrary(fJavaProject, path);
-		
-		// create launch configuration folder
-		
-		IFolder folder = pro.getFolder("launchConfigurations");
-		if (folder.exists()) {
-			folder.delete(true,null);
-		}
-		folder.create(true, true, null);
-		
-		// delete any existing launch configs
-		ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			configs[i].delete();
-		}
-		
-		// turn of suspend on  uncaught exceptions
-		setSuspendOnUncaughtExceptionsPreference(false);
-		
-		// create launch configurations
-		createLaunchConfiguration("Breakpoints");
-		createLaunchConfiguration("InstanceVariablesTests");
-		createLaunchConfiguration("LocalVariablesTests");
-		createLaunchConfiguration("StaticVariablesTests");
-		createLaunchConfiguration("DropTests");
-		createLaunchConfiguration("ThrowsNPE");
-		createLaunchConfiguration("org.eclipse.debug.tests.targets.Watchpoint");
-		createLaunchConfiguration("A");
-		createLaunchConfiguration("HitCountLooper");
-		createLaunchConfiguration("CompileError");
-		createLaunchConfiguration("MultiThreadedLoop");
-		createLaunchConfiguration("HitCountException");
-		createLaunchConfiguration("MultiThreadedException");
-		createLaunchConfiguration("MultiThreadedList");
-		createLaunchConfiguration("MethodLoop");
-		createLaunchConfiguration("StepFilterOne");
-				
-		createLaunchConfiguration("EvalArrayTests");
-		createLaunchConfiguration("EvalSimpleTests");
-		createLaunchConfiguration("EvalTypeTests");
-		createLaunchConfiguration("EvalNestedTypeTests");
-		createLaunchConfiguration("EvalTypeHierarchyTests");
-	}
-	
-	/**
-	 * Creates a shared launch configuration for the type with the given
-	 * name.
-	 */
-	protected void createLaunchConfiguration(String mainTypeName) throws Exception {
-		ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		ILaunchConfigurationWorkingCopy config = type.newInstance(getJavaProject().getProject().getFolder("launchConfigurations"), mainTypeName);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainTypeName);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-		config.doSave();
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
deleted file mode 100644
index 42810ec..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests bootpath settings
- */
-public class BootpathTests extends AbstractDebugTest {
-	
-	public BootpathTests(String name) {
-		super(name);
-	}
-
-	public void testDefaultBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		
-		JavaLocalApplicationLaunchConfigurationDelegate delegate = new JavaLocalApplicationLaunchConfigurationDelegate();
-		String[] path = delegate.getBootpath(config);
-		assertNull("Default bootpath should be null", path);
-		
-	}
-	
-	public void testEmptyBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-		
-		JavaLocalApplicationLaunchConfigurationDelegate delegate = new JavaLocalApplicationLaunchConfigurationDelegate();
-		String[] path = delegate.getBootpath(wc);
-		assertNotNull("Empty bootpath should be empty array", path);
-		assertEquals("bootpath should be empty", 0, path.length);
-		
-	}
-		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java
deleted file mode 100644
index d3a07e6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
deleted file mode 100644
index c6a215b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathProvider;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Tests runtime classpath provider extension point
- */
-public class ClasspathProviderTests extends AbstractDebugTest {
-	
-	public ClasspathProviderTests(String name) {
-		super(name);
-	}
-
-	public void testEmptyProvider() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.jdt.debug.tests.EmptyClasspathProvider");
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, "org.eclipse.jdt.debug.tests.EmptyClasspathProvider");
-		
-		IRuntimeClasspathProvider cpProvider = JavaRuntime.getClasspathProvider(wc);
-		IRuntimeClasspathProvider spProvider = JavaRuntime.getSourceLookupPathProvider(wc);
-		
-		assertNotNull("Did not retrieve classpath provider", cpProvider);
-		assertNotNull("Did not retrieve source path provider", spProvider);
-		
-		assertEquals("Classpath should be empty", 0, cpProvider.computeUnresolvedClasspath(config).length);
-		assertEquals("Source path should be empty", 0, spProvider.computeUnresolvedClasspath(config).length);
-	}
-	
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
deleted file mode 100644
index cdaa47e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests conditional breakpoints.
- */
-public class ConditionalBreakpointsTests extends AbstractDebugTest {
-	
-	public ConditionalBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleConditionalBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "i == 3");
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '3', but was " + iValue, iValue == 3);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testStaticMethodCallConditionalBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "ArgumentsTests.fact(i) == 24");
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '4', but was " + iValue, iValue == 4);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
deleted file mode 100644
index e5e6b4f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests deferred breakpoints.
- */
-public class DeferredBreakpointTests extends AbstractDebugTest {
-	
-	public DeferredBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testDeferredBreakpoints() throws Exception {
-		String typeName = "Breakpoints";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createLineBreakpoint(43, typeName));
-		// blocks
-		bps.add(createLineBreakpoint(102, typeName));
-		// constructor
-		bps.add(createLineBreakpoint(77, typeName));
-		// else
-		bps.add(createLineBreakpoint(88, typeName));
-		//finally after catch
-		bps.add(createLineBreakpoint(120, typeName));
-		//finally after try
-		bps.add(createLineBreakpoint(128, typeName));
-		// for loop
-		bps.add(createLineBreakpoint(93, typeName));
-		// if
-		bps.add(createLineBreakpoint(81, typeName));
-		// initializer
-		bps.add(createLineBreakpoint(17, typeName));
-		// inner class
-		bps.add(createLineBreakpoint(22, typeName));
-		// return true
-		bps.add(createLineBreakpoint(72, typeName));
-		// instance method
-		bps.add(createLineBreakpoint(107, typeName));
-		// static method 
-		bps.add(createLineBreakpoint(53, typeName));
-		// case statement
-		bps.add(createLineBreakpoint(133, typeName));
-		// default statement
-		bps.add(createLineBreakpoint(140, typeName));
-		// synchronized blocks
-		bps.add(createLineBreakpoint(146, typeName));
-		// try
-		bps.add(createLineBreakpoint(125, typeName));
-		//catch
-		bps.add(createLineBreakpoint(118, typeName));
-		// while
-		bps.add(createLineBreakpoint(97, typeName));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				int stackLine = thread.getTopStackFrame().getLineNumber();
-				assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDisabledBreakpoint() throws Exception {
-		String typeName = "Breakpoints";
-		ILineBreakpoint bp = createLineBreakpoint(52, typeName);
-		bp.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}				
-	}
-
-	public void testEnableDisableBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		ILineBreakpoint bp = createLineBreakpoint(16, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			bp.setEnabled(false);
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
deleted file mode 100644
index 7d79838..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests event sets.
- */
-public class EventSetTests extends AbstractDebugTest {
-	
-	public EventSetTests(String name) {
-		super(name);
-	}
-
-	public void testDoubleBreakpoint() throws Exception {
-		String typeName = "Breakpoints";
-		List bps = new ArrayList();
-		// add two breakpoints at the same location
-		bps.add(createLineBreakpoint(88, typeName));
-		bps.add(createLineBreakpoint(88, typeName));
-		
-
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				DebugEvent[] set = getEventSet();
-				assertTrue("Should be two events", set!= null && set.length == 2);
-				for (int i = 0; i < set.length; i++) {
-					assertTrue("should be a breakpoint event", set[i].getDetail() == DebugEvent.BREAKPOINT);
-				}
-				IBreakpoint[] hits = thread.getBreakpoints();
-				assertTrue("should be two breakpoints", hits != null && hits.length == 2);
-				for (int i = 0; i < hits.length; i++) {
-					bps.remove(hits[i]);
-				}
-				assertTrue("breakpoint collection should now be empty", bps.isEmpty());
-				
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
deleted file mode 100644
index 57cd5db..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests exception breakpoints.
- */
-
-public class ExceptionBreakpointTests extends AbstractDebugTest {
-	
-	public ExceptionBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testCaughtNPE() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testUncaughtNPE() throws Exception {
-		String typeName = "HitCountException";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", false, true);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			IJavaStackFrame frame= (IJavaStackFrame)thread.getTopStackFrame();
-			assertTrue("Should have been suspended at line number 35, not " + frame.getLineNumber(), frame.getLineNumber() == 35);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testDisabledCaughtNPE() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testDisabledUncaughtNPE() throws Exception {
-		String typeName = "MultiThreadedException";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", false, true);		
-		ex.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInclusiveScopedException() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"ThrowsNPE"});
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExclusiveScopedException() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setExclusionFilters(new String[] {"ThrowsNPE"});
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testHitCountException() throws Exception {
-		String typeName = "HitCountException";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, true);		
-		ex.setHitCount(2);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			IJavaStackFrame frame= (IJavaStackFrame)thread.getTopStackFrame();
-			assertTrue("Should have been suspended at linenumber", frame.getLineNumber() == 35);
-			
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testMultiExclusiveScopedExceptionHit() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setExclusionFilters(new String[] {"TestIO", "Breakpoints"});
-		
-		IJavaThread thread = null;
-		try {
-			thread = launchToBreakpoint(typeName);
-			assertNotNull("Did not suspend", thread);
-			assertEquals("Should have suspended at NPE", ex, thread.getBreakpoints()[0]);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiExclusiveScopedExceptionMissed() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setExclusionFilters(new String[] {"TestIO", "ThrowsNPE"});
-		
-		IJavaDebugTarget target= null;
-		try {
-			target = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(target);
-			removeAllBreakpoints();
-		}		
-	}			
-	
-	public void testMultiInclusiveScopedExceptionHit() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"ThrowsNPE", "Breakpoints"});
-		
-		IJavaThread thread = null;
-		try {
-			thread = launchToBreakpoint(typeName);
-			assertNotNull("Did not suspend", thread);
-			assertEquals("Should have suspended at NPE", ex, thread.getBreakpoints()[0]);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiInclusiveScopedExceptionMissed() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"TestIO", "Breakpoints"});
-		
-		IJavaDebugTarget target= null;
-		try {
-			target = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(target);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiInclusiveExclusiveScopedExceptionHit() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"ThrowsNPE", "Breakpoints"});
-		ex.setExclusionFilters(new String[] {"HitCountException", "MethodLoop"});
-		
-		IJavaThread thread = null;
-		try {
-			thread = launchToBreakpoint(typeName);
-			assertNotNull("Did not suspend", thread);
-			assertEquals("Should have suspended at NPE", ex, thread.getBreakpoints()[0]);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiInclusiveExclusiveScopedExceptionMissed() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"TestIO", "Breakpoints"});
-		ex.setExclusionFilters(new String[] {"ThrowsNPE", "MethodLoop"});
-		
-		IJavaDebugTarget target= null;
-		try {
-			target = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(target);
-			removeAllBreakpoints();
-		}		
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
deleted file mode 100644
index b90f2c9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests hit count breakpoints
- */
-public class HitCountBreakpointsTests extends AbstractDebugTest {
-
-	public HitCountBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testResetHitCountBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createLineBreakpoint(16, typeName);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '2', but was " + iValue, iValue == 2);
-			
-			bp.setHitCount(2);
-			IJavaThread thread2 = resumeToLineBreakpoint(thread, bp);
-			assertTrue("second suspended thread not the same as first", thread == thread2);			
-			
-			frame = (IJavaStackFrame)thread2.getTopStackFrame();
-			var = frame.findVariable("i");
-			value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '4', but was " + iValue, iValue == 4);
-			
-			resumeAndExit(thread2);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExpiredHitCountBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createLineBreakpoint(16, typeName);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '2', but was " + iValue, iValue == 2);
-			
-			resumeAndExit(thread);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java
deleted file mode 100644
index a2a4716..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
deleted file mode 100644
index c8277f1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/	
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaObject;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class InstanceVariableTests extends AbstractDebugTest {
-	
-	public InstanceVariableTests(String name) {
-		super(name);
-	}
-
-	public void testGetField() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(30, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable ivt = frame.findVariable("ivt");
-			assertNotNull("Could not find variable 'ivt'", ivt);
-			
-			// retrieve an instance var
-			IJavaObject value = (IJavaObject)ivt.getValue();
-			assertNotNull(value);
-			IJavaVariable pubStr = value.getField("pubStr", false);
-			assertNotNull(pubStr);
-			assertEquals("value should be 'redefined public'", pubStr.getValue().getValueString(), "redefined public");
-			
-			// retrieve an instance var in superclass
-			IJavaVariable privStr = value.getField("privStr", false);
-			assertNotNull(privStr);
-			assertEquals("value should be 'private'", privStr.getValue().getValueString(), "private");			
-			
-			// retrieve an instance var in super class with same name
-			pubStr = value.getField("pubStr", true);
-			assertNotNull(pubStr);
-			assertEquals("value should be 'public'", pubStr.getValue().getValueString(), "public");			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testEvaluationAssignments() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(28, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable pubStr = frame.findVariable("pubStr");
-			assertNotNull("Could not find variable 'pubStr'", pubStr);
-			assertEquals("'pubStr' value should be 'public'", "public", pubStr.getValue().getValueString());
-			
-			evaluate("pubStr = \"hello\";", frame);			
-			// the value should have changed
-			assertEquals("'pubStr' value should be 'hello'", "hello", pubStr.getValue().getValueString());
-			
-			evaluate("pubStr = null;", frame);
-			// the value should have changed
-			assertEquals("'pubStr' value should be 'null'", ((IJavaDebugTarget)frame.getDebugTarget()).nullValue(), pubStr.getValue());
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
deleted file mode 100644
index 10f7efd..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests for launch configurations
- */
-public class LaunchConfigurationTests extends AbstractDebugTest {
-	
-	public LaunchConfigurationTests(String name) {
-		super(name);
-	}
-	
-	/** 
-	 * Creates and returns a new launch config the given name, local
-	 * or shared, with 4 attributes:
-	 *  - String1 = "String1"
-	 *  - Int1 = 1
-	 *  - Boolean1 = true
-	 *  - Boolean2 = faslse
-	 */
-	protected ILaunchConfigurationWorkingCopy newConfiguration(IContainer container, String name) throws CoreException {
-		 ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		 assertTrue("Should support debug mode", type.supportsMode(ILaunchManager.DEBUG_MODE));
-		 assertTrue("Should support run mode", type.supportsMode(ILaunchManager.RUN_MODE));
-		 ILaunchConfigurationWorkingCopy wc = type.newInstance(container, name);
-		 wc.setAttribute("String1", "String1");
-		 wc.setAttribute("Int1", 1);
-		 wc.setAttribute("Boolean1", true);
-		 wc.setAttribute("Boolean2", false);
-		 assertTrue("Should need saving", wc.isDirty());
-		 return wc;
-	}
-		
-	/**
-	 * Returns whether the given handle is contained in the specified
-	 * array of handles.
-	 */
-	protected boolean existsIn(ILaunchConfiguration[] configs, ILaunchConfiguration config) {
-		for (int i = 0; i < configs.length; i++) {
-			if (configs[i].equals(config)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 */
-	public void testCreateLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config1");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertEquals("String1 should be String1", handle.getAttribute("String1", "Missing"), "String1");
-		 assertEquals("Int1 should be 1", handle.getAttribute("Int1", 0), 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // ensure new handle is the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle));
-		 
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}
-	
-	
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 * Copy the configuration and ensure the original still exists.
-	 */
-	public void testLocalCopy() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "configToCopy");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // ensure new handle is the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle));
-		 
-		 ILaunchConfigurationWorkingCopy softCopy = handle.copy("CopyOf" + handle.getName());
-		 assertNull("Original in copy should be null", softCopy.getOriginal());
-		 ILaunchConfiguration hardCopy = softCopy.doSave();
-
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", hardCopy.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", hardCopy.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", hardCopy.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !hardCopy.getAttribute("Boolean2", true));		 
-		 
-		 assertTrue("Original should still exist", handle.exists());
-		 
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-		 hardCopy.delete();
-		 assertTrue("Config should not exist after deletion", !hardCopy.exists());		 		 
-	}
-		
-	/**
-	 * Create a config and save it tiwce, ensuring it only
-	 * ends up in the index once.
-	 */
-	public void testDoubleSave() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "configDoubleSave");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // ensure new handle is the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle));
-		 
-		String name = wc.getName();
-		wc.rename("newName");
-		wc.rename(name);
-		assertTrue("Should be dirty", wc.isDirty());
-		wc.doSave();
-		
-		ILaunchConfiguration[] newConfigs = getLaunchManager().getLaunchConfigurations();
-		assertTrue("Should be the same number of configs", newConfigs.length == configs.length);
-		
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-		
-	}
-		
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Deletes
-	 * the configuration and ensures it no longer exists.
-	 */
-	public void testDeleteLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config2delete");
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = wc.getLocation().toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // delete 
-		 handle.delete();		 
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // ensure handle is not in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should not exist in project index", !existsIn(configs, handle));		 
-	}	
-	
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Renames
-	 * the configuration and ensures it's old config no longer exists,
-	 * and that attributes are retrievable from the new (renamed) config.
-	 */
-	public void testRenameLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config2rename");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // rename
-		 wc = handle.getWorkingCopy();
-		 wc.rename("config-2-rename");
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // retrieve new attributes
-		 assertTrue("String1 should be String1", newHandle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", newHandle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", newHandle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !newHandle.getAttribute("Boolean2", true));		 
-
-		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Renamed configuration should exist in project index", existsIn(configs, newHandle));		 
-		 assertTrue("Original configuration should NOT exist in project index", !existsIn(configs, handle));	
-		 
-		 // cleanup
-		 newHandle.delete();
-		 assertTrue("Config should not exist after deletion", !newHandle.exists());		 	 
-	}		
-	
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 */
-	public void testCreateSharedConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "config2");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
- 		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle)); 
-		 
- 		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}	
-	
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 * Copies the configuration and ensures the original still exists.
-	 */
-	public void testSharedCopy() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "config2Copy");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
- 		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle)); 
-		 
-		 // copy 
-		 ILaunchConfigurationWorkingCopy softCopy = handle.copy("CopyOf" + handle.getName());
-		 ILaunchConfiguration hardCopy = softCopy.doSave();
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", hardCopy.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", hardCopy.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", hardCopy.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !hardCopy.getAttribute("Boolean2", true));		 
-		 
-		 assertTrue("Original should still exist", handle.exists());
-		 
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-		 hardCopy.delete();
-		 assertTrue("Config should not exist after deletion", !hardCopy.exists());		 		 		 
-	}		
-	
-
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Deletes
-	 * the configuration and ensures it no longer exists.
-	 */
-	public void testDeleteSharedConfiguration() throws CoreException {
- 		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "shared2delete");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // delete 
-		 handle.delete();		 
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // ensure handle is not in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should not exist in project index", !existsIn(configs, handle));		 
-	}	
-	
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Renames
-	 * the configuration and ensures it's old config no longer exists,
-	 * and that attributes are retrievable from the new (renamed) config.
-	 */
-	public void testRenameSharedConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "shared2rename");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // rename
-		 wc = handle.getWorkingCopy();
-		 wc.rename("shared-2-rename");
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // retrieve new attributes
-		 assertTrue("String1 should be String1", newHandle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", newHandle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", newHandle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !newHandle.getAttribute("Boolean2", true));		 
-
-		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Renamed configuration should exist in project index", existsIn(configs, newHandle));		 
-		 assertTrue("Original configuration should NOT exist in project index", !existsIn(configs, handle));		 
-		 
-		 // cleanup
-		 newHandle.delete();
-		 assertTrue("Config should not exist after deletion", !newHandle.exists());		 
-	}
-	
-	/** 
-	 * Creates a few configs, closes the project and re-opens the
-	 * project to ensure the config index is persisted properly
-	 */
-	public void testPersistIndex() throws CoreException {
-		ILaunchConfigurationWorkingCopy wc1 = newConfiguration(null, "persist1local");
-		ILaunchConfigurationWorkingCopy wc2 = newConfiguration(getJavaProject().getProject(), "persist2shared");
-		ILaunchConfiguration lc1 = wc1.doSave();
-		ILaunchConfiguration lc2 = wc2.doSave();
-		
-		IProject project = getJavaProject().getProject();
-		ILaunchConfiguration[] before = getLaunchManager().getLaunchConfigurations();
-		assertTrue("config should be in index", existsIn(before, lc1));
-		assertTrue("config should be in index", existsIn(before, lc2));
-		
-		project.close(null);
-		ILaunchConfiguration[] during = getLaunchManager().getLaunchConfigurations();
-		boolean local = true;
-		for (int i = 0; i < during.length; i++) {
-			local = local && during[i].isLocal();
-		}
-		assertTrue("Should only be local configs when closed", local);
-		
-		project.open(null);
-		ILaunchConfiguration[] after = getLaunchManager().getLaunchConfigurations();
-		assertTrue("Should be same number of configs after openning", after.length == before.length);
-		for (int i = 0; i < before.length; i++) {
-			assertTrue("Config should exist after openning", existsIn(after, before[i]));
-		}
-
-		 // cleanup
-		 lc1.delete();
-		 assertTrue("Config should not exist after deletion", !lc1.exists());
-		 lc2.delete();
-		 assertTrue("Config should not exist after deletion", !lc2.exists());		 
-		 
-		
-	}	
-		
-		
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
deleted file mode 100644
index b52378e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class LocalVariableTests extends AbstractDebugTest {
-	
-	public LocalVariableTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleVisibility() throws Exception {
-		String typeName = "LocalVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(18, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IJavaVariable[] vars = frame.getLocalVariables();
-			assertEquals("Should be no visible locals", 0, vars.length);
-			
-			stepOver(frame);
-			stepOver(frame);
-			
-			vars = frame.getLocalVariables();
-			assertEquals("Should be one visible local", 1, vars.length);			
-			assertEquals("Visible var should be 'i1'", "i1", vars[0].getName());
-			
-			stepOver(frame);
-			stepOver(frame);
-			
-			vars = frame.getLocalVariables();
-			assertEquals("Should be two visible locals", 2, vars.length);			
-			assertEquals("Visible var 1 should be 'i1'", "i1", vars[0].getName());			
-			assertEquals("Visible var 2 should be 'i2'", "i2", vars[1].getName());
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testEvaluationAssignments() throws Exception {
-		String typeName = "LocalVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(22, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IJavaDebugTarget target = (IJavaDebugTarget)frame.getDebugTarget();
-			IVariable i1 = frame.findVariable("i1");
-			assertNotNull("Could not find variable 'i1'", i1);
-			assertEquals("'i1' value should be '0'", target.newValue(0), i1.getValue());
-			
-			IVariable i2 = frame.findVariable("i2");
-			assertNotNull("Could not find variable 'i2'", i2);
-			assertEquals("'i2' value should be '1'", target.newValue(1), i2.getValue());
-						
-			evaluate("i1 = 73;", frame);			
-			// the value should have changed
-			assertEquals("'i1' value should be '73'", target.newValue(73), i1.getValue());
-			
-			evaluate("i2 = i1;", frame);
-			// the value should have changed
-			assertEquals("'i2' value should be '73'", target.newValue(73), i2.getValue());
-			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
deleted file mode 100644
index be2a814..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests method breakpoints.
- */
-public class MethodBreakpointTests extends AbstractDebugTest {
-	
-	public MethodBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testEntryAndExitBreakpoints() throws Exception {
-		String typeName = "DropTests";
-		List bps = new ArrayList();
-		// method 4 - entry
-		bps.add(createMethodBreakpoint(typeName, "method4", "()V", true, false));
-		// method 1 - exit
-		bps.add(createMethodBreakpoint(typeName, "method1", "()V", false, true));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			// onto the next breakpoint			
-			thread = resume(thread);
-			
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit exit breakpoint second", bps.get(1), hit);			
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testStopInMain() throws Exception {
-		String typeName = "DropTests";
-		ILaunchConfiguration config = getLaunchConfiguration(typeName);
-		assertNotNull("Could not find launch config", config);
-		ILaunchConfigurationWorkingCopy wc = config.copy("DropTests - Stop in main");
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, true);
-		config = wc.doSave();		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchAndSuspend(config);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertTrue("Should be in 'main'", frame.getMethodName().equals("main") && frame.isStatic());
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testDisabledEntryAndExitBreakpoints() throws Exception {
-		String typeName = "DropTests";
-		// method 4 - entry
-		IBreakpoint bp1 = createMethodBreakpoint(typeName, "method4", "()V", true, false);
-		bp1.setEnabled(false);
-		// method 1 - exit
-		IBreakpoint bp2 = createMethodBreakpoint(typeName, "method1", "()V", false, true);
-		bp2.setEnabled(false);		
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInnerClassNotHit() throws Exception {
-		String typeNamePattern = "A";
-		List bps = new ArrayList();
-		// method b - entry
-		bps.add(createMethodBreakpoint(typeNamePattern, "b", "()V", true, false));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeNamePattern);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-		
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInnerClassesHit() throws Exception {
-		String typeNamePattern = "A*";
-		List bps = new ArrayList();
-		// method b - entry
-		bps.add(createMethodBreakpoint(typeNamePattern, "b", "()V", true, false));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("A");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			thread= resume(thread);
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			thread= resume(thread);
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-			
-			thread= resume(thread);
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-			
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testHitCountEntryBreakpoint() throws Exception {
-		String typeName = "MethodLoop";
-		IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, "calculateSum", "()V", true, false);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Method entry breakpoint not hit within timeout period", thread);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("sum");
-			assertNotNull("Could not find variable 'sum'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'sum' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'sum' should be '3', but was " + iValue, iValue == 3);			
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testHitCountExitBreakpoint() throws Exception {
-		String typeName = "MethodLoop";
-		IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, "calculateSum", "()V", false, true);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Method exit breakpoint not hit within timeout period", thread);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("sum");
-			assertNotNull("Could not find variable 'sum'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'sum' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'sum' should be '6', but was " + iValue, iValue == 6);			
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
deleted file mode 100644
index f84ef1c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Home for breakpoint tests that don't fit elsewhere
- */
-public class MiscBreakpointsTests extends AbstractDebugTest {
-
-	private static final String COMPILE_ERROR_CONTENTS = 
-	 "public class CompileError {\npublic static void main(String[] args) {\nString foo = \"foo\" + bar;\n}	\n}";
-
-	public MiscBreakpointsTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * This method DEPENDS on the default setting of the 'suspend on uncaught exceptions'
-	 * preference being TRUE.
-	 */
-	public void testSuspendOnUncaughtExceptions() throws Exception {
-		String typeName = "ThrowsNPE";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, true);
-				
-		IJavaThread thread = null;
-		try {
-			thread= launchAndSuspend(typeName);
-			
-			assertTrue("suspendee was not an IJavaThread", thread instanceof IJavaThread);
-			IJavaThread javaThread = (IJavaThread) thread;
-			int stackLine = javaThread.getTopStackFrame().getLineNumber();
-			assertTrue("line number should be '26', but was " + stackLine, stackLine == 26);
-		
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	/**
-	 * This method DEPENDS on the default setting of the 'suspend on compilation errors'
-	 * preference being TRUE.
-	 */
-	public void testSuspendOnCompilationErrors() throws Exception {
-		String typeName = "CompileError";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, true);		
-		
-		IType type = fJavaProject.findType(typeName);
-		ICompilationUnit cu = type.getCompilationUnit();
-		IBuffer buffer = cu.getBuffer();
-		buffer.setContents(COMPILE_ERROR_CONTENTS);
-		cu.save(new NullProgressMonitor(), true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchAndSuspend(typeName);
-			
-			assertTrue("suspendee was not an IJavaThread", thread instanceof IJavaThread);
-			IJavaThread javaThread = (IJavaThread) thread;
-			int stackLine = javaThread.getTopStackFrame().getLineNumber();
-			assertTrue("line number should be '3', but was " + stackLine, stackLine == 3);
-		
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDontSuspendOnCompilationErrors() throws Exception {
-		String typeName = "CompileError";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, false);		
-		
-		IType type = fJavaProject.findType(typeName);
-		ICompilationUnit cu = type.getCompilationUnit();
-		IBuffer buffer = cu.getBuffer();
-		buffer.setContents(COMPILE_ERROR_CONTENTS);
-		cu.save(new NullProgressMonitor(), true);
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDontSuspendOnUncaughtExceptions() throws Exception {
-		String typeName = "ThrowsNPE";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);		
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget = launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	protected IPreferenceStore getPrefStore() {
-		return JDIDebugUIPlugin.getDefault().getPreferenceStore();		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
deleted file mode 100644
index 96559ed..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests deferred pattern breakpoints.
- */
-public class PatternBreakpointTests extends AbstractDebugTest {
-	
-	public PatternBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testPatternBreakpoints() throws Exception {
-		String sourceName = "Breakpoints.java";
-		String pattern = "Break";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createPatternBreakpoint(43, sourceName, pattern));
-		// blocks
-		bps.add(createPatternBreakpoint(102, sourceName, pattern));
-		// constructor
-		bps.add(createPatternBreakpoint(77, sourceName, pattern));
-		// else
-		bps.add(createPatternBreakpoint(88, sourceName, pattern));
-		//finally after catch
-		bps.add(createPatternBreakpoint(120, sourceName, pattern));
-		//finally after try
-		bps.add(createPatternBreakpoint(128, sourceName, pattern));
-		// for loop
-		bps.add(createPatternBreakpoint(93, sourceName, pattern));
-		// if
-		bps.add(createPatternBreakpoint(81, sourceName, pattern));
-		// initializer
-		bps.add(createPatternBreakpoint(17, sourceName, pattern));
-		// inner class
-		bps.add(createPatternBreakpoint(22, sourceName, pattern));
-		// return true
-		bps.add(createPatternBreakpoint(72, sourceName, pattern));
-		// instance method
-		bps.add(createPatternBreakpoint(107, sourceName, pattern));
-		// static method 
-		bps.add(createPatternBreakpoint(53, sourceName, pattern));
-		// case statement
-		bps.add(createPatternBreakpoint(133, sourceName, pattern));
-		// default statement
-		bps.add(createPatternBreakpoint(140, sourceName, pattern));
-		// synchronized blocks
-		bps.add(createPatternBreakpoint(146, sourceName, pattern));
-		// try
-		bps.add(createPatternBreakpoint(125, sourceName, pattern));
-		//catch
-		bps.add(createPatternBreakpoint(118, sourceName, pattern));
-		// while
-		bps.add(createPatternBreakpoint(97, sourceName, pattern));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("Breakpoints");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				int stackLine = thread.getTopStackFrame().getLineNumber();
-				assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
deleted file mode 100644
index 7344513..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests IProcess.
- */
-public class ProcessTests extends AbstractDebugTest {
-	
-	public ProcessTests(String name) {
-		super(name);
-	}
-
-	public void testExitValueNormal() throws Exception {
-		String typeName = "Breakpoints";
-		ILineBreakpoint bp = createLineBreakpoint(43, typeName);
-				
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IProcess process = thread.getDebugTarget().getProcess();
-			assertNotNull("Missing process", process);
-			int exitValue = -1;
-			try {
-				exitValue = process.getExitValue();
-			} catch (DebugException e) {
-				exit(thread);
-				exitValue = process.getExitValue();
-				assertEquals("Exit value not normal", 0, exitValue);
-				return;
-			}
-			assertTrue("Should not be able to get exit value - process not terminated", false);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
deleted file mode 100644
index 35fffc8..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * Tests runtime classpath entry creation/restoration.
- */
-public class RuntimeClasspathEntryTests extends AbstractDebugTest {
-	
-	public RuntimeClasspathEntryTests(String name) {
-		super(name);
-	}
-
-	public void testProjectEntry() throws Exception {
-		IProject project = getJavaProject().getProject();
-		IRuntimeClasspathEntry entry = JavaRuntime.newProjectRuntimeClasspathEntry(getJavaProject());
-	
-		assertEquals("Paths should be equal", project.getFullPath(), entry.getPath());
-		assertEquals("Resources should be equal", project, entry.getResource());
-		assertEquals("Should be of type project", IRuntimeClasspathEntry.PROJECT, entry.getType());
-		assertEquals("Should be a user entry", IRuntimeClasspathEntry.USER_CLASSES, entry.getClasspathProperty());
-		
-		String memento = entry.getMemento();
-		IRuntimeClasspathEntry restored = JavaRuntime.newRuntimeClasspathEntry(memento);
-		assertEquals("Entries should be equal", entry, restored);
-	}
-	
-	public void testJRELIBVariableEntry() throws Exception {
-		IClasspathEntry[] cp = getJavaProject().getRawClasspath();
-		IClasspathEntry cpe = null;
-		for (int i = 0; i < cp.length; i++) {
-			if (cp[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE && cp[i].getPath().equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-				cpe = cp[i];
-				break;
-			}
-		}
-		assertNotNull("Did not find a variable entry", cpe);
-		IRuntimeClasspathEntry entry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(JavaRuntime.JRELIB_VARIABLE));
-		entry.setSourceAttachmentPath(cpe.getSourceAttachmentPath());
-		entry.setSourceAttachmentRootPath(cpe.getSourceAttachmentRootPath());
-	
-		assertEquals("Paths should be equal", cpe.getPath(), entry.getPath());
-		assertNull("Resource should be null", entry.getResource());
-		assertEquals("Should be of type varirable", IRuntimeClasspathEntry.VARIABLE, entry.getType());
-		assertEquals("Should be a standard entry", IRuntimeClasspathEntry.STANDARD_CLASSES, entry.getClasspathProperty());
-		
-		String memento = entry.getMemento();
-		IRuntimeClasspathEntry restored = JavaRuntime.newRuntimeClasspathEntry(memento);
-		assertEquals("Entries should be equal", entry, restored);
-		
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		LibraryLocation[] libs = vm.getLibraryLocations();
-		if (libs == null) {
-			libs = vm.getVMInstallType().getDefaultLibraryLocations(vm.getInstallLocation());
-		}
-		assertTrue("there is at least one system lib", libs.length >= 1);
-		
-	}	
-	
-	/**
-	 * Tests that a project can be launched if it contains the JRE_CONTAINER variable
-	 * instead of JRE_LIB
-	 * 
-	 * XXX: test waiting for bug fix in JCORE - unable to bind container if there
-	 * is no corresponding classpath entry.
-	 */
-//	public void testJREContainerEntry() throws Exception {
-//		ILaunchConfiguration lc = getLaunchConfiguration("Breakpoints");
-//		ILaunchConfigurationWorkingCopy wc = lc.copy("Breakpoints_JRE_CONTAINER");
-//		
-//		IRuntimeClasspathEntry[] cp = JavaRuntime.computeRuntimeClasspath(lc);
-//		IRuntimeClasspathEntry removed = null;
-//		List entries = new ArrayList(cp.length);
-//		// replace JRE_LIB with JRE_CONTAINER
-//		for (int i = 0; i < cp.length; i++) {
-//			if (cp[i].getType() == IRuntimeClasspathEntry.VARIABLE) {
-//				removed = cp[i];
-//				cp[i] = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), getJavaProject().getElementName());	
-//			}
-//			entries.add(cp[i].getMemento());
-//		}
-//		
-//		assertNotNull("Did not replace entry", removed);
-//		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-//		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, entries);
-//		lc = wc.doSave();
-//		
-//		createLineBreakpoint(52, "Breakpoints");
-//		IJavaThread thread= null;
-//		try {
-//			thread = launch(lc);
-//			assertNotNull("Launch failed", thread);
-//		} finally {
-//			terminateAndRemove(thread);
-//			removeAllBreakpoints();
-//		}
-//	}	
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
deleted file mode 100644
index 96d07e2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.sourcelookup.ArchiveSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.DirectorySourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.JavaProjectSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.JavaSourceLocator;
-import org.eclipse.jdt.launching.sourcelookup.PackageFragmentRootSourceLocation;
-
-/**
- * Tests source location creation/restoration.
- */
-public class SourceLocationTests extends AbstractDebugTest {
-	
-	public SourceLocationTests(String name) {
-		super(name);
-	}
-
-	public void testProjectLocationMemento() throws Exception {
-		IJavaSourceLocation location = new JavaProjectSourceLocation(getJavaProject());
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new JavaProjectSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("project locations should be equal", location, restored);
-	}
-	
-	public void testDirectoryLocationMemento() throws Exception {
-		File dir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(dir);
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new DirectorySourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("directory locations should be equal", location, restored);
-	}	
-	
-	public void testArchiveLocationMemento() throws Exception {
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		IJavaSourceLocation location = new ArchiveSourceLocation(JavaRuntime.getLibraryLocations(vm)[0].getSystemLibraryPath().toOSString(), null);
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new ArchiveSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("archive locations should be equal", location, restored);
-	}	
-	
-	public void testJavaSourceLocatorMemento() throws Exception {
-		IJavaSourceLocation location1 = new JavaProjectSourceLocation(getJavaProject());
-		File dir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
-		IJavaSourceLocation location2 = new DirectorySourceLocation(dir);
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		IJavaSourceLocation location3 = new ArchiveSourceLocation(JavaRuntime.getLibraryLocations(vm)[0].getSystemLibraryPath().toOSString(), null);
-		
-		JavaSourceLocator locator = new JavaSourceLocator(new IJavaSourceLocation[] {location1, location2, location3});
-		String memento = locator.getMemento();
-		JavaSourceLocator restored = new JavaSourceLocator();
-		restored.initializeFromMemento(memento);
-		IJavaSourceLocation[] locations = restored.getSourceLocations();
-		
-		assertEquals("wrong number of source locations", 3, locations.length);
-		assertEquals("1st locations not equal", location1, locations[0]);
-		assertEquals("2nd locations not equal", location2, locations[1]);
-		assertEquals("3rd locations not equal", location3, locations[2]);
-	}
-	
-	public void testPackageFragmentRootLocationMemento() throws Exception {
-		IResource res = getJavaProject().getProject().getFolder("src");
-		IPackageFragmentRoot root = getJavaProject().getPackageFragmentRoot(res);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new PackageFragmentRootSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("root locations should be equal", location, restored);
-	}
-	
-	public void testEmptyPackageFragmentRootLocationMemento() throws Exception {
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation();
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new PackageFragmentRootSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("root locations should be equal", location, restored);
-	}	
-		
-	public void testPositiveSourceFolderSourceLocation() throws Exception {
-		IResource res = getJavaProject().getProject().getFolder("src");
-		IPackageFragmentRoot root = getJavaProject().getPackageFragmentRoot(res);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		Object source = location.findSourceElement("Breakpoints");
-		assertTrue("Did not find source for 'Breakpoints'", source instanceof ICompilationUnit);
-		ICompilationUnit cu = (ICompilationUnit)source;
-		assertEquals("Did not find source for 'Breakpoints'", cu.getElementName(), "Breakpoints.java");
-		
-		source = location.findSourceElement("org.eclipse.debug.tests.targets.InfiniteLoop");
-		assertTrue("Did not find source for 'InfiniteLoop'", source instanceof ICompilationUnit);
-		cu = (ICompilationUnit)source;
-		assertEquals("Did not find source for 'Breakpoints'", cu.getElementName(), "InfiniteLoop.java");
-	}
-	
-	public void testNegativeSourceFolderSourceLocation() throws Exception {
-		IResource res = getJavaProject().getProject().getFolder("src");
-		IPackageFragmentRoot root = getJavaProject().getPackageFragmentRoot(res);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		Object source = location.findSourceElement("DoesNotExist");
-		assertNull("Should not have found source", source);
-		
-		source = location.findSourceElement("org.eclipse.DoesNotExist");
-		assertNull("Should not have found source", source);
-	}	
-	
-	public void testPositiveSystemLibrarySourceLocation() throws Exception {
-		IClasspathEntry[] cpes = getJavaProject().getRawClasspath();
-		IClasspathEntry lib = null;
-		for (int i = 0; i < cpes.length; i++) {
-			if (cpes[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
-				if (cpes[i].getPath().equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-					lib = cpes[i];
-					break;
-				}
-			}
-		}
-		assertNotNull("Could not find JRE_LIB entry", lib);
-		
-		IPackageFragmentRoot[] roots = getJavaProject().getPackageFragmentRoots(lib);
-		assertEquals("Should be one root for JRE_LIB", roots.length, 1);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(roots[0]);
-		
-		Object source = location.findSourceElement("java.lang.Object");
-		assertTrue("Did not find source for 'Object'", source instanceof IClassFile);
-		IClassFile cf = (IClassFile)source;
-		assertEquals("Did not find source for 'Object'", "Object.class", cf.getElementName());
-		
-		source = location.findSourceElement("java.util.Vector$1");
-		assertTrue("Did not find source for 'Vector$1'", source instanceof IClassFile);
-		cf = (IClassFile)source;
-		assertEquals("Did not find source for 'Vector$1'", "Vector$1.class", cf.getElementName());
-	}
-	
-	public void testNegativeSystemLibrarySourceLocation() throws Exception {
-		IClasspathEntry[] cpes = getJavaProject().getRawClasspath();
-		IClasspathEntry lib = null;
-		for (int i = 0; i < cpes.length; i++) {
-			if (cpes[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
-				if (cpes[i].getPath().equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-					lib = cpes[i];
-					break;
-				}
-			}
-		}
-		assertNotNull("Could not find JRE_LIB entry", lib);
-		
-		IPackageFragmentRoot[] roots = getJavaProject().getPackageFragmentRoots(lib);
-		assertEquals("Should be one root for JRE_LIB", roots.length, 1);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(roots[0]);
-		
-		Object source = location.findSourceElement("xyz.abc.Object");
-		assertNull("Should not find source", source);
-
-	}	
-		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
deleted file mode 100644
index 85c5391..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class StaticVariableTests extends AbstractDebugTest {
-	
-	public StaticVariableTests(String name) {
-		super(name);
-	}
-
-	public void testSetValue() throws Exception {
-		String typeName = "StaticVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(40, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable pubStr = frame.findVariable("pubStr");
-			assertNotNull("Could not find variable 'pubStr'", pubStr);
-			
-			assertEquals("Value should be 'public'","public", pubStr.getValue().getValueString());
-			pubStr.setValue(((IJavaDebugTarget)frame.getDebugTarget()).newValue("test"));
-			assertEquals("Value should be 'test'","test", pubStr.getValue().getValueString());
-			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
deleted file mode 100644
index e57c66f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Step filtering tests
- * This test forces the UI plugins to load.
- */
-public class StepFilterTests extends AbstractDebugTest {
-
-	private String fOriginalActiveFilters;
-	private String fOriginalInactiveFilters;
-
-	public StepFilterTests(String name) {
-		super(name);
-		fOriginalActiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST);
-		fOriginalInactiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST);		
-	}
-
-	public void testSimpleStepFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepInto(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 22, but was " + lineNumber, lineNumber == 22);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}				
-	}
-	
-	public void testInactiveStepFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo");
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepInto(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterTwo' but was " + recTypeName, recTypeName.equals("StepFilterTwo"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 25, but was " + lineNumber, lineNumber == 25);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}						
-	}
-	
-	public void testDeepStepFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(22, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepInto(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterThree' but was " + recTypeName, recTypeName.equals("StepFilterThree"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 19, but was " + lineNumber, lineNumber == 19);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}				
-	}	
-
-	protected void resetStepFilters() {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters);
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalInactiveFilters);
-	}
-
-	protected IPreferenceStore getPrefStore() {
-		return JDIDebugUIPlugin.getDefault().getPreferenceStore();		
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
deleted file mode 100644
index 5fac810..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Test that a SUSPEND_VM breakpoint suspends all threads
- */
-public class SuspendVMBreakpointsTests extends AbstractDebugTest {
-
-	public SuspendVMBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testSuspendVmLineBreakpoint() throws Exception {
-		String typeName = "MultiThreadedLoop";
-		IJavaLineBreakpoint bp = createLineBreakpoint(40, typeName);
-		bp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			
-			verifyAllThreadsSuspended(thread);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testSuspendVmExceptionBreakpoint() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			
-			verifyAllThreadsSuspended(thread);
-			
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testSuspendVmAccessWatchpointBreakpoint() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		wp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			
-			verifyAllThreadsSuspended(thread);
-			
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	public void testSuspendVmModificationWatchpointBreakpoint() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", false, true);
-		wp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			verifyAllThreadsSuspended(thread);
-			
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testSuspendVmMethodEntryBreakpoint() throws Exception {
-		String typeName = "DropTests";
-		IJavaBreakpoint bp = createMethodBreakpoint(typeName, "method4", "()V", true, false);
-		bp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("breakpoint was not a method breakpoint", hit instanceof IJavaMethodBreakpoint);
-
-			verifyAllThreadsSuspended(thread);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testSuspendVmMethodExitBreakpoint() throws Exception {
-		String typeName = "DropTests";
-		IJavaBreakpoint bp = createMethodBreakpoint(typeName, "method1", "()V", false, true);		
-		bp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("breakpoint was not a method breakpoint", hit instanceof IJavaMethodBreakpoint);
-
-			verifyAllThreadsSuspended(thread);
-						
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	protected void verifyAllThreadsSuspended(IJavaThread thread) {
-		try {
-			IJavaDebugTarget debugTarget = (IJavaDebugTarget)thread.getDebugTarget();
-			IThread[] threads = debugTarget.getThreads();
-			for (int i = 0; i < threads.length; i++) {
-				assertTrue("Thread wasn't suspended when a SUSPEND_VM breakpoint was hit, thread=" + threads[i].getName(), threads[i].isSuspended());
-			}		
-		} catch (DebugException e) {
-			fail(e.getMessage());
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
deleted file mode 100644
index f74fe22..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.core.dom.Message;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaBreakpointListener;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaTargetPatternBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaType;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
-
-/**
- * Tests deferred target pattern breakpoints.
- */
-public class TargetPatternBreakpointTests extends AbstractDebugTest implements IJavaBreakpointListener {
-	
-	public TargetPatternBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testTargetPatternBreakpoints() throws Exception {
-		JDIDebugPlugin.getDefault().addJavaBreakpointListener(this);
-		
-		String sourceName = "Breakpoints.java";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createTargetPatternBreakpoint(43, sourceName));
-		// blocks
-		bps.add(createTargetPatternBreakpoint(102, sourceName));
-		// constructor
-		bps.add(createTargetPatternBreakpoint(77, sourceName));
-		// else
-		bps.add(createTargetPatternBreakpoint(66, sourceName));
-		//finally after catch
-		bps.add(createTargetPatternBreakpoint(120, sourceName));
-		//finally after try
-		bps.add(createTargetPatternBreakpoint(128, sourceName));
-		// for loop
-		bps.add(createTargetPatternBreakpoint(93, sourceName));
-		// if
-		bps.add(createTargetPatternBreakpoint(81, sourceName));
-		// initializer
-		bps.add(createTargetPatternBreakpoint(17, sourceName));
-		// inner class
-		bps.add(createTargetPatternBreakpoint(22, sourceName));
-		// return true
-		bps.add(createTargetPatternBreakpoint(72, sourceName));
-		// instance method
-		bps.add(createTargetPatternBreakpoint(107, sourceName));
-		// static method 
-		bps.add(createTargetPatternBreakpoint(53, sourceName));
-		// case statement
-		bps.add(createTargetPatternBreakpoint(133, sourceName));
-		// default statement
-		bps.add(createTargetPatternBreakpoint(140, sourceName));
-		// synchronized blocks
-		bps.add(createTargetPatternBreakpoint(146, sourceName));
-		// try
-		bps.add(createTargetPatternBreakpoint(125, sourceName));
-		//catch
-		bps.add(createTargetPatternBreakpoint(118, sourceName));
-		// while
-		bps.add(createTargetPatternBreakpoint(97, sourceName));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("Breakpoints");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				int stackLine = thread.getTopStackFrame().getLineNumber();
-				assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			JDIDebugPlugin.getDefault().removeJavaBreakpointListener(this);
-		}		
-	}
-	/**
-	 * @see IJavaBreakpointListener#addingBreakpoint(IJavaDebugTarget, IJavaBreakpoint)
-	 */
-	public void addingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-			if (breakpoint instanceof IJavaTargetPatternBreakpoint) {
-				IJavaTargetPatternBreakpoint bp = (IJavaTargetPatternBreakpoint)breakpoint;
-				try {
-					bp.setPattern(target,"Breakp");
-				} catch (CoreException e) {
-					assertTrue("Failed to set pattern", false);
-				}
-			}
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointHit(IJavaThread, IJavaBreakpoint)
-	 */
-	public boolean breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
-		return true;
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointInstalled(IJavaDebugTarget, IJavaBreakpoint)
-	 */
-	public void breakpointInstalled(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointRemoved(IJavaDebugTarget, IJavaBreakpoint)
-	 */
-	public void breakpointRemoved(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#installingBreakpoint(IJavaDebugTarget, IJavaBreakpoint, IJavaType)
-	 */
-	public boolean installingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint,
-		IJavaType type) {
-		return true;
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointHasCompilationErrors(IJavaLineBreakpoint, Message[])
-	 */
-	public void breakpointHasCompilationErrors(
-		IJavaLineBreakpoint breakpoint,
-		Message[] errors) {
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointHasRuntimeException(IJavaLineBreakpoint, DebugException)
-	 */
-	public void breakpointHasRuntimeException(
-		IJavaLineBreakpoint breakpoint,
-		DebugException exception) {
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
deleted file mode 100644
index 84dbeac..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests breakpoints with thread filters
- */
-public class ThreadFilterBreakpointsTests extends AbstractDebugTest {
-
-	public ThreadFilterBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleThreadFilterBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createLineBreakpoint(16, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			bp.setThreadFilter(thread);
-			resumeToLineBreakpoint(thread, bp);
-						
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testMultiThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedLoop";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(17, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			
-			IJavaLineBreakpoint bp2 = createLineBreakpoint(40, typeName);
-			bp2.setThreadFilter(thread);
-			
-			thread = resumeToLineBreakpoint(thread, bp2);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-						
-			bp1.delete();
-			bp2.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExceptionThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedException";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(17, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			IJavaExceptionBreakpoint ex1 = createExceptionBreakpoint("java.lang.NullPointerException", false, true);
-			ex1.setThreadFilter(thread);
-			
-			thread = resume(thread);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-			
-			bp1.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-			
-	public void testAccessWatchpointThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedList";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(21, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);			
-			wp.setThreadFilter(thread);			
-			
-			thread = resume(thread);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-			
-			bp1.delete();
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-			
-	public void testModificationWatchpointThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedList";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(22, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			IJavaWatchpoint wp = createWatchpoint(typeName, "i", false, true);			
-			wp.setThreadFilter(thread);			
-			
-			thread = resume(thread);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-			
-			bp1.delete();
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java
deleted file mode 100644
index d480807..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaType;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests equality of Java types.
- */
-public class TypeTests extends AbstractDebugTest {
-	
-	public TypeTests(String name) {
-		super(name);
-	}
-
-	public void testDeclaringTypes() throws Exception {
-		IJavaType[] types = new IJavaType[3];
-		int index = 0;
-		String typeName = "Breakpoints";
-		List bps = new ArrayList();
-		// main
-		bps.add(createLineBreakpoint(52, typeName));
-		// threading
-		bps.add(createLineBreakpoint(66, typeName));
-		// InnerRunnable.run
-		bps.add(createLineBreakpoint(61, typeName));		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				types[index] = frame.getDeclaringType();
-				
-				if (index == 1) {
-					assertEquals("First two types should be the same", types[0], types[1]);
-				}
-				
-				if (index == 2) {
-					assertTrue("Last two types should be different", !types[0].equals(types[2]));
-				}
-				
-				index++;
-				int stackLine = frame.getLineNumber();
-				assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
deleted file mode 100644
index d2abb68..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class WatchpointTests extends AbstractDebugTest {
-	
-	public WatchpointTests(String name) {
-		super(name);
-	}
-
-	public void testAccessAndModification() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			// should hit access 10 times
-			int count = 10;
-			while (count > 0) {
-				thread = resume(thread);
-				hit = getBreakpoint(thread);
-				frame = thread.getTopStackFrame();
-				assertNotNull("No breakpoint", hit);
-				assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-				assertEquals("Should be line 30", 30, frame.getLineNumber());
-				count--;
-			}
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testModification() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", false, true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testDisabledModification() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", false, true);
-		wp.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testAccess() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			
-			// should hit access 9 more times
-			int count = 9;
-			while (count > 0) {
-				thread = resume(thread);
-				hit = getBreakpoint(thread);
-				frame = thread.getTopStackFrame();
-				assertNotNull("No breakpoint", hit);
-				assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-				assertEquals("Should be line 30", 30, frame.getLineNumber());
-				count--;
-			}
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	public void testDisabledAccess() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			
-			wp.setEnabled(false);
-						
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	public void testHitCountAccess() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		wp.setHitCount(4);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			IVariable var = frame.findVariable("value");
-			assertNotNull("Could not find variable 'value'", var);
-			
-			// retrieve an instance var
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull(value);
-			int varValue = value.getIntValue();
-			assertTrue("'value' should be 7", varValue == 7);			
-			
-			wp.setHitCount(0);
-			
-			// should hit access 6 more times
-			int count = 6;
-			while (count > 0) {
-				thread = resume(thread);
-				hit = getBreakpoint(thread);
-				frame = (IJavaStackFrame) thread.getTopStackFrame();
-				assertNotNull("No breakpoint", hit);
-				assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-				assertEquals("Should be line 30", 30, frame.getLineNumber());
-				count--;
-			}
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
deleted file mode 100644
index 3f9e01d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class ArrayAllocationTests extends Tests {
-
-	public ArrayAllocationTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests", 37, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + equalOp + "new byte[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayByte + equalOp + "new byte[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		value = eval(yArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + equalOp + "new char[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayChar + equalOp + "new char[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		value = eval(yArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + equalOp + "new short[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayShort + equalOp + "new short[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		value = eval(yArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + equalOp + "new int[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayInt + equalOp + "new int[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + equalOp + "new long[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayLong + equalOp + "new long[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		value = eval(yArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + equalOp + "new float[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayFloat + equalOp + "new float[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		value = eval(yArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + equalOp + "new double[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayDouble + equalOp + "new double[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		value = eval(yArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + equalOp + "new java.lang.String[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayString + equalOp + "new java.lang.String[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + equalOp + "new boolean[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayBoolean + equalOp + "new boolean[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		value = eval(yArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java
deleted file mode 100644
index bde5de2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java
+++ /dev/null
@@ -1,707 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ArrayAssignementTests extends Tests {
-
-	public ArrayAssignementTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests", 37, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + "[0]" + equalOp +xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(xArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(xArrayByte + "[1]" + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(xArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(xArrayByte + "[2]" + equalOp +xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(xArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(yArrayByte + "[0]" + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(yArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(yArrayByte + "[1]" + equalOp +xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(yArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(yArrayByte + "[2]" + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(yArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + "[0]" + equalOp +xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", xCharValue, charValue);
-		value = eval(xArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-
-		value = eval(xArrayChar + "[1]" + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", yCharValue, charValue);
-		value = eval(xArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-
-		value = eval(xArrayChar + "[2]" + equalOp +xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", xCharValue, charValue);
-		value = eval(xArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-
-		value = eval(yArrayChar + "[0]" + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", yCharValue, charValue);
-		value = eval(yArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-
-		value = eval(yArrayChar + "[1]" + equalOp +xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", xCharValue, charValue);
-		value = eval(yArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-
-		value = eval(yArrayChar + "[2]" + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", yCharValue, charValue);
-		value = eval(yArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + "[0]" + equalOp +xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(xArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(xArrayShort + "[1]" + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(xArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(xArrayShort + "[2]" + equalOp +xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(xArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(yArrayShort + "[0]" + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(yArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(yArrayShort + "[1]" + equalOp +xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(yArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(yArrayShort + "[2]" + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(yArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]" + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xArrayInt + "[1]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(xArrayInt + "[2]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[0]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + "[1]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[2]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + "[0]" + equalOp +xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", xLongValue, longValue);
-		value = eval(xArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-
-		value = eval(xArrayLong + "[1]" + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", yLongValue, longValue);
-		value = eval(xArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-
-		value = eval(xArrayLong + "[2]" + equalOp +xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", xLongValue, longValue);
-		value = eval(xArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-
-		value = eval(yArrayLong + "[0]" + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", yLongValue, longValue);
-		value = eval(yArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-
-		value = eval(yArrayLong + "[1]" + equalOp +xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", xLongValue, longValue);
-		value = eval(yArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-
-		value = eval(yArrayLong + "[2]" + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", yLongValue, longValue);
-		value = eval(yArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + "[0]" + equalOp +xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(xArrayFloat + "[1]" + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(xArrayFloat + "[2]" + equalOp +xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + "[0]" + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + "[1]" + equalOp +xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + "[2]" + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + "[0]" + equalOp +xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(xArrayDouble + "[1]" + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(xArrayDouble + "[2]" + equalOp +xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + "[0]" + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + "[1]" + equalOp +xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + "[2]" + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]" + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xArrayString + "[1]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(xArrayString + "[2]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[0]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + "[1]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[2]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + "[0]" + equalOp +xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(xArrayBoolean + "[1]" + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(xArrayBoolean + "[2]" + equalOp +xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + "[0]" + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + "[1]" + equalOp +xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + "[2]" + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
deleted file mode 100644
index 8bc40b1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
+++ /dev/null
@@ -1,517 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ArrayInitializationTests extends Tests {
-
-	public ArrayInitializationTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests", 37, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + equalOp + "new byte[]{" + xByte + ", " + yByte + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		int intValue = 0;
-		byte byteValue = yByteValue;
-		value = eval(xArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", 2, intValue);
-		value = eval(xArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-		value = eval(xArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(yArrayByte + equalOp + "new byte[]{" + xByte + ", " + yByte + ", " + xByte + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		value = eval(yArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", 3, intValue);
-		value = eval(yArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-		value = eval(yArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-		value = eval(yArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + equalOp + "new char[]{" + xChar + ", " + yChar + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		int intValue = 0;
-		char charValue = yCharValue;
-		value = eval(xArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", 2, intValue);
-		value = eval(xArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-		value = eval(xArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-
-		value = eval(yArrayChar + equalOp + "new char[]{" + xChar + ", " + yChar + ", " + xChar + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		value = eval(yArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", 3, intValue);
-		value = eval(yArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-		value = eval(yArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-		value = eval(yArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + equalOp + "new short[]{" + xShort + ", " + yShort + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		int intValue = 0;
-		short shortValue = yShortValue;
-		value = eval(xArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", 2, intValue);
-		value = eval(xArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-		value = eval(xArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(yArrayShort + equalOp + "new short[]{" + xShort + ", " + yShort + ", " + xShort + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		value = eval(yArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", 3, intValue);
-		value = eval(yArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-		value = eval(yArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-		value = eval(yArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 2, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + ", " + xInt + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 3, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + equalOp + "new long[]{" + xLong + ", " + yLong + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		int intValue = 0;
-		long longValue = yLongValue;
-		value = eval(xArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", 2, intValue);
-		value = eval(xArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-		value = eval(xArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-
-		value = eval(yArrayLong + equalOp + "new long[]{" + xLong + ", " + yLong + ", " + xLong + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		value = eval(yArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", 3, intValue);
-		value = eval(yArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-		value = eval(yArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-		value = eval(yArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + equalOp + "new float[]{" + xFloat + ", " + yFloat + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		int intValue = 0;
-		float floatValue = yFloatValue;
-		value = eval(xArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", 2, intValue);
-		value = eval(xArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + equalOp + "new float[]{" + xFloat + ", " + yFloat + ", " + xFloat + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		value = eval(yArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", 3, intValue);
-		value = eval(yArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + equalOp + "new double[]{" + xDouble + ", " + yDouble + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		int intValue = 0;
-		double doubleValue = yDoubleValue;
-		value = eval(xArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", 2, intValue);
-		value = eval(xArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + equalOp + "new double[]{" + xDouble + ", " + yDouble + ", " + xDouble + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		value = eval(yArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", 3, intValue);
-		value = eval(yArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		int intValue = 0;
-		java.lang.String stringValue = yStringValue;
-		value = eval(xArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 2, intValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + ", " + xString + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 3, intValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + equalOp + "new boolean[]{" + xBoolean + ", " + yBoolean + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		int intValue = 0;
-		boolean booleanValue = yBooleanValue;
-		value = eval(xArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", 2, intValue);
-		value = eval(xArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + equalOp + "new boolean[]{" + xBoolean + ", " + yBoolean + ", " + xBoolean + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		value = eval(yArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", 3, intValue);
-		value = eval(yArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
deleted file mode 100644
index db5d335..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
+++ /dev/null
@@ -1,627 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ArrayValueTests extends Tests {
-
-	public ArrayValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests", 37, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", xArrayByteValue.length, intValue);
-
-		value = eval(yArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", yArrayByteValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", xArrayCharValue.length, intValue);
-
-		value = eval(yArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", yArrayCharValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", xArrayShortValue.length, intValue);
-
-		value = eval(yArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", yArrayShortValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", xArrayIntValue.length, intValue);
-
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", yArrayIntValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", xArrayLongValue.length, intValue);
-
-		value = eval(yArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", yArrayLongValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", xArrayFloatValue.length, intValue);
-
-		value = eval(yArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", yArrayFloatValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", xArrayDoubleValue.length, intValue);
-
-		value = eval(yArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", yArrayDoubleValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", xArrayStringValue.length, intValue);
-
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", yArrayStringValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", xArrayBooleanValue.length, intValue);
-
-		value = eval(yArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", yArrayBooleanValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xArrayByteValue[0], byteValue);
-
-		value = eval(xArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xArrayByteValue[1], byteValue);
-
-		value = eval(xArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xArrayByteValue[2], byteValue);
-
-		value = eval(yArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yArrayByteValue[0], byteValue);
-
-		value = eval(yArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yArrayByteValue[1], byteValue);
-
-		value = eval(yArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yArrayByteValue[2], byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xArrayCharValue[0], charValue);
-
-		value = eval(xArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xArrayCharValue[1], charValue);
-
-		value = eval(xArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xArrayCharValue[2], charValue);
-
-		value = eval(yArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yArrayCharValue[0], charValue);
-
-		value = eval(yArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yArrayCharValue[1], charValue);
-
-		value = eval(yArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yArrayCharValue[2], charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xArrayShortValue[0], shortValue);
-
-		value = eval(xArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xArrayShortValue[1], shortValue);
-
-		value = eval(xArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xArrayShortValue[2], shortValue);
-
-		value = eval(yArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yArrayShortValue[0], shortValue);
-
-		value = eval(yArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yArrayShortValue[1], shortValue);
-
-		value = eval(yArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yArrayShortValue[2], shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[0], intValue);
-
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[1], intValue);
-
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[2], intValue);
-
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[0], intValue);
-
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[1], intValue);
-
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[2], intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xArrayLongValue[0], longValue);
-
-		value = eval(xArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xArrayLongValue[1], longValue);
-
-		value = eval(xArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xArrayLongValue[2], longValue);
-
-		value = eval(yArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yArrayLongValue[0], longValue);
-
-		value = eval(yArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yArrayLongValue[1], longValue);
-
-		value = eval(yArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yArrayLongValue[2], longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xArrayFloatValue[0], floatValue, 0);
-
-		value = eval(xArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xArrayFloatValue[1], floatValue, 0);
-
-		value = eval(xArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xArrayFloatValue[2], floatValue, 0);
-
-		value = eval(yArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yArrayFloatValue[0], floatValue, 0);
-
-		value = eval(yArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yArrayFloatValue[1], floatValue, 0);
-
-		value = eval(yArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yArrayFloatValue[2], floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xArrayDoubleValue[0], doubleValue, 0);
-
-		value = eval(xArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xArrayDoubleValue[1], doubleValue, 0);
-
-		value = eval(xArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xArrayDoubleValue[2], doubleValue, 0);
-
-		value = eval(yArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yArrayDoubleValue[0], doubleValue, 0);
-
-		value = eval(yArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yArrayDoubleValue[1], doubleValue, 0);
-
-		value = eval(yArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yArrayDoubleValue[2], doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[0], stringValue);
-
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[1], stringValue);
-
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[2], stringValue);
-
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[0], stringValue);
-
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[1], stringValue);
-
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[2], stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xArrayBooleanValue[0], booleanValue);
-
-		value = eval(xArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xArrayBooleanValue[1], booleanValue);
-
-		value = eval(xArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xArrayBooleanValue[2], booleanValue);
-
-		value = eval(yArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yArrayBooleanValue[0], booleanValue);
-
-		value = eval(yArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yArrayBooleanValue[1], booleanValue);
-
-		value = eval(yArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yArrayBooleanValue[2], booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
deleted file mode 100644
index 198ff8b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class BooleanAssignmentOperatorsTests extends Tests {
-
-	public BooleanAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 37, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// boolean |= boolean
-
-	public void testBooleanOrAssignmentBoolean() throws Throwable {
-		try {
-		init();
-		boolean tmpxVar = xVarBooleanValue;
-		tmpxVar |= xBooleanValue;
-		IValue value = eval(xVarBoolean + orAssignmentOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		tmpxVar |= yBooleanValue;
-		value = eval(xVarBoolean + orAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		boolean tmpyVar = yVarBooleanValue;
-		tmpyVar |= xBooleanValue;
-		value = eval(yVarBoolean + orAssignmentOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-
-		tmpyVar |= yBooleanValue;
-		value = eval(yVarBoolean + orAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// boolean &= boolean
-
-	public void testBooleanAndAssignmentBoolean() throws Throwable {
-		try {
-		init();
-		boolean tmpxVar = xVarBooleanValue;
-		tmpxVar &= xBooleanValue;
-		IValue value = eval(xVarBoolean + andAssignmentOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		tmpxVar &= yBooleanValue;
-		value = eval(xVarBoolean + andAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		boolean tmpyVar = yVarBooleanValue;
-		tmpyVar &= xBooleanValue;
-		value = eval(yVarBoolean + andAssignmentOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-
-		tmpyVar &= yBooleanValue;
-		value = eval(yVarBoolean + andAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// boolean ^= boolean
-
-	public void testBooleanXorAssignmentBoolean() throws Throwable {
-		try {
-		init();
-		boolean tmpxVar = xVarBooleanValue;
-		tmpxVar ^= xBooleanValue;
-		IValue value = eval(xVarBoolean + xorAssignmentOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		tmpxVar ^= yBooleanValue;
-		value = eval(xVarBoolean + xorAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		boolean tmpyVar = yVarBooleanValue;
-		tmpyVar ^= xBooleanValue;
-		value = eval(yVarBoolean + xorAssignmentOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-
-		tmpyVar ^= yBooleanValue;
-		value = eval(yVarBoolean + xorAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
deleted file mode 100644
index 334b585..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class BooleanOperatorsTests extends Tests {
-
-	public BooleanOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// boolean | boolean
-
-	public void testBooleanOrBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xBoolean + orOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", xBooleanValue | xBooleanValue, booleanValue);
-
-		value = eval(xBoolean + orOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", xBooleanValue | yBooleanValue, booleanValue);
-
-		value = eval(yBoolean + orOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", yBooleanValue | xBooleanValue, booleanValue);
-
-		value = eval(yBoolean + orOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", yBooleanValue | yBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// boolean & boolean
-
-	public void testBooleanAndBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xBoolean + andOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", xBooleanValue & xBooleanValue, booleanValue);
-
-		value = eval(xBoolean + andOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", xBooleanValue & yBooleanValue, booleanValue);
-
-		value = eval(yBoolean + andOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", yBooleanValue & xBooleanValue, booleanValue);
-
-		value = eval(yBoolean + andOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", yBooleanValue & yBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// boolean ^ boolean
-
-	public void testBooleanXorBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xBoolean + xorOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", xBooleanValue ^ xBooleanValue, booleanValue);
-
-		value = eval(xBoolean + xorOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", xBooleanValue ^ yBooleanValue, booleanValue);
-
-		value = eval(yBoolean + xorOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", yBooleanValue ^ xBooleanValue, booleanValue);
-
-		value = eval(yBoolean + xorOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", yBooleanValue ^ yBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// ! boolean
-
-	public void testNotBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(notOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("not boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("not boolean : wrong result : ", ! xBooleanValue, booleanValue);
-
-		value = eval(notOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("not boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("not boolean : wrong result : ", ! yBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
deleted file mode 100644
index 58fc31a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class ByteAssignmentOperatorsTests extends Tests {
-
-	public ByteAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// byte += {byte, char, short, int, long, float, double}
-
-	public void testBytePlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarByte + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarByte + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarByte + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarByte + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarByte + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarByte + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarByte + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarByte + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarByte + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarByte + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarByte + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarByte + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarByte + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarByte + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarByte + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarByte + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarByte + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarByte + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarByte + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarByte + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarByte + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte -= {byte, char, short, int, long, float, double}
-
-	public void testByteMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarByte + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarByte + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarByte + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarByte + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarByte + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarByte + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarByte + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarByte + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarByte + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarByte + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarByte + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarByte + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarByte + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarByte + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarByte + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarByte + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarByte + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarByte + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarByte + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarByte + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarByte + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte *= {byte, char, short, int, long, float, double}
-
-	public void testByteMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte /= {byte, char, short, int, long, float, double}
-
-	public void testByteDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarByte + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarByte + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarByte + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarByte + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarByte + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarByte + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarByte + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarByte + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarByte + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarByte + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarByte + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarByte + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarByte + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarByte + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarByte + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarByte + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarByte + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarByte + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarByte + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarByte + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarByte + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte %= {byte, char, short, int, long, float, double}
-
-	public void testByteRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarByte + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarByte + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarByte + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarByte + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarByte + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarByte + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarByte + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarByte + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarByte + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarByte + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarByte + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarByte + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarByte + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarByte + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarByte + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarByte + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarByte + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarByte + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarByte + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarByte + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarByte + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte <<= {byte, char, short, int, long, float, double}
-
-	public void testByteLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte >>= {byte, char, short, int, long, float, double}
-
-	public void testByteRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte >>>= {byte, char, short, int, long, float, double}
-
-	public void testByteUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte |= {byte, char, short, int, long, float, double}
-
-	public void testByteOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarByte + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarByte + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarByte + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarByte + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarByte + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarByte + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarByte + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarByte + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarByte + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarByte + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarByte + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarByte + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarByte + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarByte + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarByte + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte &= {byte, char, short, int, long, float, double}
-
-	public void testByteAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarByte + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarByte + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarByte + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarByte + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarByte + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarByte + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarByte + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarByte + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarByte + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarByte + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarByte + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarByte + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarByte + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarByte + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarByte + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte ^= {byte, char, short, int, long, float, double}
-
-	public void testByteXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarByte + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarByte + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarByte + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarByte + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarByte + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarByte + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarByte + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarByte + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarByte + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarByte + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarByte + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarByte + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarByte + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarByte + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarByte + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
deleted file mode 100644
index 89adf11..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ByteOperatorsTests extends Tests {
-
-	public ByteOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// byte + {byte, char, short, int, long, float, double}
-
-	public void testBytePlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus byte : wrong result : ", xByteValue + yByteValue, intValue);
-
-		value = eval(yByte + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus byte : wrong result : ", yByteValue + xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus char : wrong result : ", xByteValue + yCharValue, intValue);
-
-		value = eval(yByte + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus char : wrong result : ", yByteValue + xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus short : wrong result : ", xByteValue + yShortValue, intValue);
-
-		value = eval(yByte + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus short : wrong result : ", yByteValue + xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus int : wrong result : ", xByteValue + yIntValue, intValue);
-
-		value = eval(yByte + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus int : wrong result : ", yByteValue + xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte plus long : wrong result : ", xByteValue + yLongValue, longValue);
-
-		value = eval(yByte + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte plus long : wrong result : ", yByteValue + xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte plus float : wrong result : ", xByteValue + yFloatValue, floatValue, 0);
-
-		value = eval(yByte + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte plus float : wrong result : ", yByteValue + xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte plus double : wrong result : ", xByteValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte plus double : wrong result : ", yByteValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBytePlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("byte plus java.lang.String : wrong result : ", xByteValue + yStringValue, stringValue);
-
-		value = eval(yByte + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("byte plus java.lang.String : wrong result : ", yByteValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte - {byte, char, short, int, long, float, double}
-
-	public void testByteMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus byte : wrong result : ", xByteValue - yByteValue, intValue);
-
-		value = eval(yByte + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus byte : wrong result : ", yByteValue - xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus char : wrong result : ", xByteValue - yCharValue, intValue);
-
-		value = eval(yByte + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus char : wrong result : ", yByteValue - xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus short : wrong result : ", xByteValue - yShortValue, intValue);
-
-		value = eval(yByte + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus short : wrong result : ", yByteValue - xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus int : wrong result : ", xByteValue - yIntValue, intValue);
-
-		value = eval(yByte + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus int : wrong result : ", yByteValue - xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte minus long : wrong result : ", xByteValue - yLongValue, longValue);
-
-		value = eval(yByte + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte minus long : wrong result : ", yByteValue - xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte minus float : wrong result : ", xByteValue - yFloatValue, floatValue, 0);
-
-		value = eval(yByte + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte minus float : wrong result : ", yByteValue - xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte minus double : wrong result : ", xByteValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte minus double : wrong result : ", yByteValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte * {byte, char, short, int, long, float, double}
-
-	public void testByteMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply byte : wrong result : ", xByteValue * yByteValue, intValue);
-
-		value = eval(yByte + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply byte : wrong result : ", yByteValue * xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply char : wrong result : ", xByteValue * yCharValue, intValue);
-
-		value = eval(yByte + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply char : wrong result : ", yByteValue * xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply short : wrong result : ", xByteValue * yShortValue, intValue);
-
-		value = eval(yByte + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply short : wrong result : ", yByteValue * xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply int : wrong result : ", xByteValue * yIntValue, intValue);
-
-		value = eval(yByte + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply int : wrong result : ", yByteValue * xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte multiply long : wrong result : ", xByteValue * yLongValue, longValue);
-
-		value = eval(yByte + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte multiply long : wrong result : ", yByteValue * xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte multiply float : wrong result : ", xByteValue * yFloatValue, floatValue, 0);
-
-		value = eval(yByte + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte multiply float : wrong result : ", yByteValue * xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte multiply double : wrong result : ", xByteValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte multiply double : wrong result : ", yByteValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte / {byte, char, short, int, long, float, double}
-
-	public void testByteDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide byte : wrong result : ", xByteValue / yByteValue, intValue);
-
-		value = eval(yByte + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide byte : wrong result : ", yByteValue / xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide char : wrong result : ", xByteValue / yCharValue, intValue);
-
-		value = eval(yByte + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide char : wrong result : ", yByteValue / xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide short : wrong result : ", xByteValue / yShortValue, intValue);
-
-		value = eval(yByte + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide short : wrong result : ", yByteValue / xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide int : wrong result : ", xByteValue / yIntValue, intValue);
-
-		value = eval(yByte + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide int : wrong result : ", yByteValue / xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte divide long : wrong result : ", xByteValue / yLongValue, longValue);
-
-		value = eval(yByte + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte divide long : wrong result : ", yByteValue / xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte divide float : wrong result : ", xByteValue / yFloatValue, floatValue, 0);
-
-		value = eval(yByte + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte divide float : wrong result : ", yByteValue / xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte divide double : wrong result : ", xByteValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte divide double : wrong result : ", yByteValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte % {byte, char, short, int, long, float, double}
-
-	public void testByteRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder byte : wrong result : ", xByteValue % yByteValue, intValue);
-
-		value = eval(yByte + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder byte : wrong result : ", yByteValue % xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder char : wrong result : ", xByteValue % yCharValue, intValue);
-
-		value = eval(yByte + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder char : wrong result : ", yByteValue % xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder short : wrong result : ", xByteValue % yShortValue, intValue);
-
-		value = eval(yByte + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder short : wrong result : ", yByteValue % xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder int : wrong result : ", xByteValue % yIntValue, intValue);
-
-		value = eval(yByte + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder int : wrong result : ", yByteValue % xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte remainder long : wrong result : ", xByteValue % yLongValue, longValue);
-
-		value = eval(yByte + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte remainder long : wrong result : ", yByteValue % xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte remainder float : wrong result : ", xByteValue % yFloatValue, floatValue, 0);
-
-		value = eval(yByte + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte remainder float : wrong result : ", yByteValue % xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte remainder double : wrong result : ", xByteValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte remainder double : wrong result : ", yByteValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte > {byte, char, short, int, long, float, double}
-
-	public void testByteGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater byte : wrong result : ", xByteValue > yByteValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater byte : wrong result : ", yByteValue > xByteValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater byte : wrong result : ", xByteValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater char : wrong result : ", xByteValue > yCharValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater char : wrong result : ", yByteValue > xCharValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater char : wrong result : ", xByteValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater short : wrong result : ", xByteValue > yShortValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater short : wrong result : ", yByteValue > xShortValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater short : wrong result : ", xByteValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater int : wrong result : ", xByteValue > yIntValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater int : wrong result : ", yByteValue > xIntValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater int : wrong result : ", xByteValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater long : wrong result : ", xByteValue > yLongValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater long : wrong result : ", yByteValue > xLongValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater long : wrong result : ", xByteValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater float : wrong result : ", xByteValue > yFloatValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater float : wrong result : ", yByteValue > xFloatValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater float : wrong result : ", xByteValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater double : wrong result : ", xByteValue > yDoubleValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater double : wrong result : ", yByteValue > xDoubleValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater double : wrong result : ", xByteValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte >= {byte, char, short, int, long, float, double}
-
-	public void testByteGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual byte : wrong result : ", xByteValue >= yByteValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual byte : wrong result : ", yByteValue >= xByteValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual byte : wrong result : ", xByteValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual char : wrong result : ", xByteValue >= yCharValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual char : wrong result : ", yByteValue >= xCharValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual char : wrong result : ", xByteValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual short : wrong result : ", xByteValue >= yShortValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual short : wrong result : ", yByteValue >= xShortValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual short : wrong result : ", xByteValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual int : wrong result : ", xByteValue >= yIntValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual int : wrong result : ", yByteValue >= xIntValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual int : wrong result : ", xByteValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual long : wrong result : ", xByteValue >= yLongValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual long : wrong result : ", yByteValue >= xLongValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual long : wrong result : ", xByteValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual float : wrong result : ", xByteValue >= yFloatValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual float : wrong result : ", yByteValue >= xFloatValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual float : wrong result : ", xByteValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual double : wrong result : ", xByteValue >= yDoubleValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual double : wrong result : ", yByteValue >= xDoubleValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual double : wrong result : ", xByteValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte < {byte, char, short, int, long, float, double}
-
-	public void testByteLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less byte : wrong result : ", xByteValue < yByteValue, booleanValue);
-
-		value = eval(yByte + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less byte : wrong result : ", yByteValue < xByteValue, booleanValue);
-
-		value = eval(xByte + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less byte : wrong result : ", xByteValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less char : wrong result : ", xByteValue < yCharValue, booleanValue);
-
-		value = eval(yByte + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less char : wrong result : ", yByteValue < xCharValue, booleanValue);
-
-		value = eval(xByte + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less char : wrong result : ", xByteValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less short : wrong result : ", xByteValue < yShortValue, booleanValue);
-
-		value = eval(yByte + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less short : wrong result : ", yByteValue < xShortValue, booleanValue);
-
-		value = eval(xByte + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less short : wrong result : ", xByteValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less int : wrong result : ", xByteValue < yIntValue, booleanValue);
-
-		value = eval(yByte + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less int : wrong result : ", yByteValue < xIntValue, booleanValue);
-
-		value = eval(xByte + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less int : wrong result : ", xByteValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less long : wrong result : ", xByteValue < yLongValue, booleanValue);
-
-		value = eval(yByte + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less long : wrong result : ", yByteValue < xLongValue, booleanValue);
-
-		value = eval(xByte + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less long : wrong result : ", xByteValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less float : wrong result : ", xByteValue < yFloatValue, booleanValue);
-
-		value = eval(yByte + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less float : wrong result : ", yByteValue < xFloatValue, booleanValue);
-
-		value = eval(xByte + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less float : wrong result : ", xByteValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less double : wrong result : ", xByteValue < yDoubleValue, booleanValue);
-
-		value = eval(yByte + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less double : wrong result : ", yByteValue < xDoubleValue, booleanValue);
-
-		value = eval(xByte + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less double : wrong result : ", xByteValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte <= {byte, char, short, int, long, float, double}
-
-	public void testByteLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual byte : wrong result : ", xByteValue <= yByteValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual byte : wrong result : ", yByteValue <= xByteValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual byte : wrong result : ", xByteValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual char : wrong result : ", xByteValue <= yCharValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual char : wrong result : ", yByteValue <= xCharValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual char : wrong result : ", xByteValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual short : wrong result : ", xByteValue <= yShortValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual short : wrong result : ", yByteValue <= xShortValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual short : wrong result : ", xByteValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual int : wrong result : ", xByteValue <= yIntValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual int : wrong result : ", yByteValue <= xIntValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual int : wrong result : ", xByteValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual long : wrong result : ", xByteValue <= yLongValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual long : wrong result : ", yByteValue <= xLongValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual long : wrong result : ", xByteValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual float : wrong result : ", xByteValue <= yFloatValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual float : wrong result : ", yByteValue <= xFloatValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual float : wrong result : ", xByteValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual double : wrong result : ", xByteValue <= yDoubleValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual double : wrong result : ", yByteValue <= xDoubleValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual double : wrong result : ", xByteValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte == {byte, char, short, int, long, float, double}
-
-	public void testByteEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual byte : wrong result : ", xByteValue == yByteValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual byte : wrong result : ", yByteValue == xByteValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual byte : wrong result : ", xByteValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual char : wrong result : ", xByteValue == yCharValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual char : wrong result : ", yByteValue == xCharValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual char : wrong result : ", xByteValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual short : wrong result : ", xByteValue == yShortValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual short : wrong result : ", yByteValue == xShortValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual short : wrong result : ", xByteValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual int : wrong result : ", xByteValue == yIntValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual int : wrong result : ", yByteValue == xIntValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual int : wrong result : ", xByteValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual long : wrong result : ", xByteValue == yLongValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual long : wrong result : ", yByteValue == xLongValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual long : wrong result : ", xByteValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual float : wrong result : ", xByteValue == yFloatValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual float : wrong result : ", yByteValue == xFloatValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual float : wrong result : ", xByteValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual double : wrong result : ", xByteValue == yDoubleValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual double : wrong result : ", yByteValue == xDoubleValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual double : wrong result : ", xByteValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte != {byte, char, short, int, long, float, double}
-
-	public void testByteNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual byte : wrong result : ", xByteValue != yByteValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual byte : wrong result : ", yByteValue != xByteValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual byte : wrong result : ", xByteValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual char : wrong result : ", xByteValue != yCharValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual char : wrong result : ", yByteValue != xCharValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual char : wrong result : ", xByteValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual short : wrong result : ", xByteValue != yShortValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual short : wrong result : ", yByteValue != xShortValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual short : wrong result : ", xByteValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual int : wrong result : ", xByteValue != yIntValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual int : wrong result : ", yByteValue != xIntValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual int : wrong result : ", xByteValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual long : wrong result : ", xByteValue != yLongValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual long : wrong result : ", yByteValue != xLongValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual long : wrong result : ", xByteValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual float : wrong result : ", xByteValue != yFloatValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual float : wrong result : ", yByteValue != xFloatValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual float : wrong result : ", xByteValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual double : wrong result : ", xByteValue != yDoubleValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual double : wrong result : ", yByteValue != xDoubleValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual double : wrong result : ", xByteValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte << {byte, char, short, int, long}
-
-	public void testByteLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift byte : wrong result : ", xByteValue << yByteValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift byte : wrong result : ", yByteValue << xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift char : wrong result : ", xByteValue << yCharValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift char : wrong result : ", yByteValue << xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift short : wrong result : ", xByteValue << yShortValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift short : wrong result : ", yByteValue << xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift int : wrong result : ", xByteValue << yIntValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift int : wrong result : ", yByteValue << xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift long : wrong result : ", xByteValue << yLongValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift long : wrong result : ", yByteValue << xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte >> {byte, char, short, int, long}
-
-	public void testByteRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift byte : wrong result : ", xByteValue >> yByteValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift byte : wrong result : ", yByteValue >> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift char : wrong result : ", xByteValue >> yCharValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift char : wrong result : ", yByteValue >> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift short : wrong result : ", xByteValue >> yShortValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift short : wrong result : ", yByteValue >> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift int : wrong result : ", xByteValue >> yIntValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift int : wrong result : ", yByteValue >> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift long : wrong result : ", xByteValue >> yLongValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift long : wrong result : ", yByteValue >> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte >>> {byte, char, short, int, long}
-
-	public void testByteUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift byte : wrong result : ", xByteValue >>> yByteValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift byte : wrong result : ", yByteValue >>> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift char : wrong result : ", xByteValue >>> yCharValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift char : wrong result : ", yByteValue >>> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift short : wrong result : ", xByteValue >>> yShortValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift short : wrong result : ", yByteValue >>> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift int : wrong result : ", xByteValue >>> yIntValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift int : wrong result : ", yByteValue >>> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift long : wrong result : ", xByteValue >>> yLongValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift long : wrong result : ", yByteValue >>> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte | {byte, char, short, int, long}
-
-	public void testByteOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or byte : wrong result : ", xByteValue | yByteValue, intValue);
-
-		value = eval(yByte + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or byte : wrong result : ", yByteValue | xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or char : wrong result : ", xByteValue | yCharValue, intValue);
-
-		value = eval(yByte + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or char : wrong result : ", yByteValue | xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or short : wrong result : ", xByteValue | yShortValue, intValue);
-
-		value = eval(yByte + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or short : wrong result : ", yByteValue | xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or int : wrong result : ", xByteValue | yIntValue, intValue);
-
-		value = eval(yByte + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or int : wrong result : ", yByteValue | xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte or long : wrong result : ", xByteValue | yLongValue, longValue);
-
-		value = eval(yByte + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte or long : wrong result : ", yByteValue | xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte & {byte, char, short, int, long}
-
-	public void testByteAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and byte : wrong result : ", xByteValue & yByteValue, intValue);
-
-		value = eval(yByte + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and byte : wrong result : ", yByteValue & xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and char : wrong result : ", xByteValue & yCharValue, intValue);
-
-		value = eval(yByte + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and char : wrong result : ", yByteValue & xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and short : wrong result : ", xByteValue & yShortValue, intValue);
-
-		value = eval(yByte + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and short : wrong result : ", yByteValue & xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and int : wrong result : ", xByteValue & yIntValue, intValue);
-
-		value = eval(yByte + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and int : wrong result : ", yByteValue & xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte and long : wrong result : ", xByteValue & yLongValue, longValue);
-
-		value = eval(yByte + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte and long : wrong result : ", yByteValue & xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// byte ^ {byte, char, short, int, long}
-
-	public void testByteXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor byte : wrong result : ", xByteValue ^ yByteValue, intValue);
-
-		value = eval(yByte + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor byte : wrong result : ", yByteValue ^ xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor char : wrong result : ", xByteValue ^ yCharValue, intValue);
-
-		value = eval(yByte + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor char : wrong result : ", yByteValue ^ xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor short : wrong result : ", xByteValue ^ yShortValue, intValue);
-
-		value = eval(yByte + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor short : wrong result : ", yByteValue ^ xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor int : wrong result : ", xByteValue ^ yIntValue, intValue);
-
-		value = eval(yByte + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor int : wrong result : ", yByteValue ^ xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte xor long : wrong result : ", xByteValue ^ yLongValue, longValue);
-
-		value = eval(yByte + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte xor long : wrong result : ", yByteValue ^ xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + byte
-
-	public void testPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus byte : wrong result : ", + xByteValue, intValue);
-
-		value = eval(plusOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus byte : wrong result : ", + yByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - byte
-
-	public void testMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus byte : wrong result : ", - xByteValue, intValue);
-
-		value = eval(minusOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus byte : wrong result : ", - yByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// ~ byte
-
-	public void testTwiddleByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle byte : wrong result : ", ~ xByteValue, intValue);
-
-		value = eval(twiddleOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle byte : wrong result : ", ~ yByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
deleted file mode 100644
index f71b73f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class CharAssignmentOperatorsTests extends Tests {
-
-	public CharAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// char += {byte, char, short, int, long, float, double}
-
-	public void testCharPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarChar + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarChar + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarChar + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarChar + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarChar + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarChar + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarChar + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarChar + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarChar + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarChar + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarChar + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarChar + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarChar + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarChar + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarChar + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarChar + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarChar + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarChar + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarChar + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarChar + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarChar + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char -= {byte, char, short, int, long, float, double}
-
-	public void testCharMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarChar + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarChar + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarChar + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarChar + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarChar + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarChar + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarChar + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarChar + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarChar + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarChar + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarChar + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarChar + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarChar + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarChar + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarChar + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarChar + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarChar + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarChar + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarChar + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarChar + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarChar + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char *= {byte, char, short, int, long, float, double}
-
-	public void testCharMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char /= {byte, char, short, int, long, float, double}
-
-	public void testCharDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarChar + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarChar + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarChar + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarChar + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarChar + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarChar + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarChar + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarChar + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarChar + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarChar + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarChar + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarChar + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarChar + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarChar + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarChar + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarChar + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarChar + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarChar + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarChar + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarChar + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarChar + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char %= {byte, char, short, int, long, float, double}
-
-	public void testCharRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarChar + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarChar + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarChar + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarChar + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarChar + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarChar + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarChar + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarChar + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarChar + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarChar + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarChar + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarChar + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarChar + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarChar + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarChar + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarChar + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarChar + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarChar + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarChar + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarChar + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarChar + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char <<= {byte, char, short, int, long, float, double}
-
-	public void testCharLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char >>= {byte, char, short, int, long, float, double}
-
-	public void testCharRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char >>>= {byte, char, short, int, long, float, double}
-
-	public void testCharUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char |= {byte, char, short, int, long, float, double}
-
-	public void testCharOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarChar + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarChar + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarChar + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarChar + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarChar + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarChar + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarChar + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarChar + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarChar + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarChar + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarChar + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarChar + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarChar + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarChar + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarChar + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char &= {byte, char, short, int, long, float, double}
-
-	public void testCharAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarChar + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarChar + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarChar + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarChar + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarChar + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarChar + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarChar + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarChar + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarChar + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarChar + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarChar + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarChar + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarChar + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarChar + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarChar + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char ^= {byte, char, short, int, long, float, double}
-
-	public void testCharXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarChar + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarChar + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarChar + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarChar + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarChar + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarChar + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarChar + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarChar + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarChar + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarChar + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarChar + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarChar + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarChar + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarChar + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarChar + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
deleted file mode 100644
index 00086a8..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class CharOperatorsTests extends Tests {
-
-	public CharOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// char + {byte, char, short, int, long, float, double}
-
-	public void testCharPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus byte : wrong result : ", xCharValue + yByteValue, intValue);
-
-		value = eval(yChar + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus byte : wrong result : ", yCharValue + xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus char : wrong result : ", xCharValue + yCharValue, intValue);
-
-		value = eval(yChar + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus char : wrong result : ", yCharValue + xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus short : wrong result : ", xCharValue + yShortValue, intValue);
-
-		value = eval(yChar + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus short : wrong result : ", yCharValue + xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus int : wrong result : ", xCharValue + yIntValue, intValue);
-
-		value = eval(yChar + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus int : wrong result : ", yCharValue + xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char plus long : wrong result : ", xCharValue + yLongValue, longValue);
-
-		value = eval(yChar + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char plus long : wrong result : ", yCharValue + xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char plus float : wrong result : ", xCharValue + yFloatValue, floatValue, 0);
-
-		value = eval(yChar + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char plus float : wrong result : ", yCharValue + xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char plus double : wrong result : ", xCharValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char plus double : wrong result : ", yCharValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("char plus java.lang.String : wrong result : ", xCharValue + yStringValue, stringValue);
-
-		value = eval(yChar + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("char plus java.lang.String : wrong result : ", yCharValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char - {byte, char, short, int, long, float, double}
-
-	public void testCharMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus byte : wrong result : ", xCharValue - yByteValue, intValue);
-
-		value = eval(yChar + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus byte : wrong result : ", yCharValue - xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus char : wrong result : ", xCharValue - yCharValue, intValue);
-
-		value = eval(yChar + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus char : wrong result : ", yCharValue - xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus short : wrong result : ", xCharValue - yShortValue, intValue);
-
-		value = eval(yChar + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus short : wrong result : ", yCharValue - xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus int : wrong result : ", xCharValue - yIntValue, intValue);
-
-		value = eval(yChar + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus int : wrong result : ", yCharValue - xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char minus long : wrong result : ", xCharValue - yLongValue, longValue);
-
-		value = eval(yChar + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char minus long : wrong result : ", yCharValue - xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char minus float : wrong result : ", xCharValue - yFloatValue, floatValue, 0);
-
-		value = eval(yChar + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char minus float : wrong result : ", yCharValue - xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char minus double : wrong result : ", xCharValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char minus double : wrong result : ", yCharValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char * {byte, char, short, int, long, float, double}
-
-	public void testCharMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply byte : wrong result : ", xCharValue * yByteValue, intValue);
-
-		value = eval(yChar + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply byte : wrong result : ", yCharValue * xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply char : wrong result : ", xCharValue * yCharValue, intValue);
-
-		value = eval(yChar + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply char : wrong result : ", yCharValue * xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply short : wrong result : ", xCharValue * yShortValue, intValue);
-
-		value = eval(yChar + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply short : wrong result : ", yCharValue * xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply int : wrong result : ", xCharValue * yIntValue, intValue);
-
-		value = eval(yChar + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply int : wrong result : ", yCharValue * xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char multiply long : wrong result : ", xCharValue * yLongValue, longValue);
-
-		value = eval(yChar + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char multiply long : wrong result : ", yCharValue * xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char multiply float : wrong result : ", xCharValue * yFloatValue, floatValue, 0);
-
-		value = eval(yChar + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char multiply float : wrong result : ", yCharValue * xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char multiply double : wrong result : ", xCharValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char multiply double : wrong result : ", yCharValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char / {byte, char, short, int, long, float, double}
-
-	public void testCharDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide byte : wrong result : ", xCharValue / yByteValue, intValue);
-
-		value = eval(yChar + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide byte : wrong result : ", yCharValue / xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide char : wrong result : ", xCharValue / yCharValue, intValue);
-
-		value = eval(yChar + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide char : wrong result : ", yCharValue / xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide short : wrong result : ", xCharValue / yShortValue, intValue);
-
-		value = eval(yChar + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide short : wrong result : ", yCharValue / xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide int : wrong result : ", xCharValue / yIntValue, intValue);
-
-		value = eval(yChar + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide int : wrong result : ", yCharValue / xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char divide long : wrong result : ", xCharValue / yLongValue, longValue);
-
-		value = eval(yChar + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char divide long : wrong result : ", yCharValue / xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char divide float : wrong result : ", xCharValue / yFloatValue, floatValue, 0);
-
-		value = eval(yChar + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char divide float : wrong result : ", yCharValue / xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char divide double : wrong result : ", xCharValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char divide double : wrong result : ", yCharValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char % {byte, char, short, int, long, float, double}
-
-	public void testCharRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder byte : wrong result : ", xCharValue % yByteValue, intValue);
-
-		value = eval(yChar + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder byte : wrong result : ", yCharValue % xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder char : wrong result : ", xCharValue % yCharValue, intValue);
-
-		value = eval(yChar + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder char : wrong result : ", yCharValue % xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder short : wrong result : ", xCharValue % yShortValue, intValue);
-
-		value = eval(yChar + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder short : wrong result : ", yCharValue % xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder int : wrong result : ", xCharValue % yIntValue, intValue);
-
-		value = eval(yChar + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder int : wrong result : ", yCharValue % xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char remainder long : wrong result : ", xCharValue % yLongValue, longValue);
-
-		value = eval(yChar + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char remainder long : wrong result : ", yCharValue % xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char remainder float : wrong result : ", xCharValue % yFloatValue, floatValue, 0);
-
-		value = eval(yChar + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char remainder float : wrong result : ", yCharValue % xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char remainder double : wrong result : ", xCharValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char remainder double : wrong result : ", yCharValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char > {byte, char, short, int, long, float, double}
-
-	public void testCharGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater byte : wrong result : ", xCharValue > yByteValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater byte : wrong result : ", yCharValue > xByteValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater byte : wrong result : ", xCharValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater char : wrong result : ", xCharValue > yCharValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater char : wrong result : ", yCharValue > xCharValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater char : wrong result : ", xCharValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater short : wrong result : ", xCharValue > yShortValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater short : wrong result : ", yCharValue > xShortValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater short : wrong result : ", xCharValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater int : wrong result : ", xCharValue > yIntValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater int : wrong result : ", yCharValue > xIntValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater int : wrong result : ", xCharValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater long : wrong result : ", xCharValue > yLongValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater long : wrong result : ", yCharValue > xLongValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater long : wrong result : ", xCharValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater float : wrong result : ", xCharValue > yFloatValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater float : wrong result : ", yCharValue > xFloatValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater float : wrong result : ", xCharValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater double : wrong result : ", xCharValue > yDoubleValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater double : wrong result : ", yCharValue > xDoubleValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater double : wrong result : ", xCharValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char >= {byte, char, short, int, long, float, double}
-
-	public void testCharGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual byte : wrong result : ", xCharValue >= yByteValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual byte : wrong result : ", yCharValue >= xByteValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual byte : wrong result : ", xCharValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual char : wrong result : ", xCharValue >= yCharValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual char : wrong result : ", yCharValue >= xCharValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual char : wrong result : ", xCharValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual short : wrong result : ", xCharValue >= yShortValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual short : wrong result : ", yCharValue >= xShortValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual short : wrong result : ", xCharValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual int : wrong result : ", xCharValue >= yIntValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual int : wrong result : ", yCharValue >= xIntValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual int : wrong result : ", xCharValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual long : wrong result : ", xCharValue >= yLongValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual long : wrong result : ", yCharValue >= xLongValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual long : wrong result : ", xCharValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual float : wrong result : ", xCharValue >= yFloatValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual float : wrong result : ", yCharValue >= xFloatValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual float : wrong result : ", xCharValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual double : wrong result : ", xCharValue >= yDoubleValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual double : wrong result : ", yCharValue >= xDoubleValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual double : wrong result : ", xCharValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char < {byte, char, short, int, long, float, double}
-
-	public void testCharLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less byte : wrong result : ", xCharValue < yByteValue, booleanValue);
-
-		value = eval(yChar + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less byte : wrong result : ", yCharValue < xByteValue, booleanValue);
-
-		value = eval(xChar + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less byte : wrong result : ", xCharValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less char : wrong result : ", xCharValue < yCharValue, booleanValue);
-
-		value = eval(yChar + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less char : wrong result : ", yCharValue < xCharValue, booleanValue);
-
-		value = eval(xChar + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less char : wrong result : ", xCharValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less short : wrong result : ", xCharValue < yShortValue, booleanValue);
-
-		value = eval(yChar + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less short : wrong result : ", yCharValue < xShortValue, booleanValue);
-
-		value = eval(xChar + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less short : wrong result : ", xCharValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less int : wrong result : ", xCharValue < yIntValue, booleanValue);
-
-		value = eval(yChar + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less int : wrong result : ", yCharValue < xIntValue, booleanValue);
-
-		value = eval(xChar + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less int : wrong result : ", xCharValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less long : wrong result : ", xCharValue < yLongValue, booleanValue);
-
-		value = eval(yChar + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less long : wrong result : ", yCharValue < xLongValue, booleanValue);
-
-		value = eval(xChar + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less long : wrong result : ", xCharValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less float : wrong result : ", xCharValue < yFloatValue, booleanValue);
-
-		value = eval(yChar + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less float : wrong result : ", yCharValue < xFloatValue, booleanValue);
-
-		value = eval(xChar + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less float : wrong result : ", xCharValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less double : wrong result : ", xCharValue < yDoubleValue, booleanValue);
-
-		value = eval(yChar + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less double : wrong result : ", yCharValue < xDoubleValue, booleanValue);
-
-		value = eval(xChar + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less double : wrong result : ", xCharValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char <= {byte, char, short, int, long, float, double}
-
-	public void testCharLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual byte : wrong result : ", xCharValue <= yByteValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual byte : wrong result : ", yCharValue <= xByteValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual byte : wrong result : ", xCharValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual char : wrong result : ", xCharValue <= yCharValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual char : wrong result : ", yCharValue <= xCharValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual char : wrong result : ", xCharValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual short : wrong result : ", xCharValue <= yShortValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual short : wrong result : ", yCharValue <= xShortValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual short : wrong result : ", xCharValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual int : wrong result : ", xCharValue <= yIntValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual int : wrong result : ", yCharValue <= xIntValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual int : wrong result : ", xCharValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual long : wrong result : ", xCharValue <= yLongValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual long : wrong result : ", yCharValue <= xLongValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual long : wrong result : ", xCharValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual float : wrong result : ", xCharValue <= yFloatValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual float : wrong result : ", yCharValue <= xFloatValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual float : wrong result : ", xCharValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual double : wrong result : ", xCharValue <= yDoubleValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual double : wrong result : ", yCharValue <= xDoubleValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual double : wrong result : ", xCharValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char == {byte, char, short, int, long, float, double}
-
-	public void testCharEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual byte : wrong result : ", xCharValue == yByteValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual byte : wrong result : ", yCharValue == xByteValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual byte : wrong result : ", xCharValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual char : wrong result : ", xCharValue == yCharValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual char : wrong result : ", yCharValue == xCharValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual char : wrong result : ", xCharValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual short : wrong result : ", xCharValue == yShortValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual short : wrong result : ", yCharValue == xShortValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual short : wrong result : ", xCharValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual int : wrong result : ", xCharValue == yIntValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual int : wrong result : ", yCharValue == xIntValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual int : wrong result : ", xCharValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual long : wrong result : ", xCharValue == yLongValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual long : wrong result : ", yCharValue == xLongValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual long : wrong result : ", xCharValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual float : wrong result : ", xCharValue == yFloatValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual float : wrong result : ", yCharValue == xFloatValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual float : wrong result : ", xCharValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual double : wrong result : ", xCharValue == yDoubleValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual double : wrong result : ", yCharValue == xDoubleValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual double : wrong result : ", xCharValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char != {byte, char, short, int, long, float, double}
-
-	public void testCharNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual byte : wrong result : ", xCharValue != yByteValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual byte : wrong result : ", yCharValue != xByteValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual byte : wrong result : ", xCharValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual char : wrong result : ", xCharValue != yCharValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual char : wrong result : ", yCharValue != xCharValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual char : wrong result : ", xCharValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual short : wrong result : ", xCharValue != yShortValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual short : wrong result : ", yCharValue != xShortValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual short : wrong result : ", xCharValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual int : wrong result : ", xCharValue != yIntValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual int : wrong result : ", yCharValue != xIntValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual int : wrong result : ", xCharValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual long : wrong result : ", xCharValue != yLongValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual long : wrong result : ", yCharValue != xLongValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual long : wrong result : ", xCharValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual float : wrong result : ", xCharValue != yFloatValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual float : wrong result : ", yCharValue != xFloatValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual float : wrong result : ", xCharValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual double : wrong result : ", xCharValue != yDoubleValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual double : wrong result : ", yCharValue != xDoubleValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual double : wrong result : ", xCharValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char << {byte, char, short, int, long}
-
-	public void testCharLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift byte : wrong result : ", xCharValue << yByteValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift byte : wrong result : ", yCharValue << xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift char : wrong result : ", xCharValue << yCharValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift char : wrong result : ", yCharValue << xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift short : wrong result : ", xCharValue << yShortValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift short : wrong result : ", yCharValue << xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift int : wrong result : ", xCharValue << yIntValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift int : wrong result : ", yCharValue << xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift long : wrong result : ", xCharValue << yLongValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift long : wrong result : ", yCharValue << xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char >> {byte, char, short, int, long}
-
-	public void testCharRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift byte : wrong result : ", xCharValue >> yByteValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift byte : wrong result : ", yCharValue >> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift char : wrong result : ", xCharValue >> yCharValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift char : wrong result : ", yCharValue >> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift short : wrong result : ", xCharValue >> yShortValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift short : wrong result : ", yCharValue >> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift int : wrong result : ", xCharValue >> yIntValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift int : wrong result : ", yCharValue >> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift long : wrong result : ", xCharValue >> yLongValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift long : wrong result : ", yCharValue >> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char >>> {byte, char, short, int, long}
-
-	public void testCharUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift byte : wrong result : ", xCharValue >>> yByteValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift byte : wrong result : ", yCharValue >>> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift char : wrong result : ", xCharValue >>> yCharValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift char : wrong result : ", yCharValue >>> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift short : wrong result : ", xCharValue >>> yShortValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift short : wrong result : ", yCharValue >>> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift int : wrong result : ", xCharValue >>> yIntValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift int : wrong result : ", yCharValue >>> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift long : wrong result : ", xCharValue >>> yLongValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift long : wrong result : ", yCharValue >>> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char | {byte, char, short, int, long}
-
-	public void testCharOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or byte : wrong result : ", xCharValue | yByteValue, intValue);
-
-		value = eval(yChar + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or byte : wrong result : ", yCharValue | xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or char : wrong result : ", xCharValue | yCharValue, intValue);
-
-		value = eval(yChar + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or char : wrong result : ", yCharValue | xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or short : wrong result : ", xCharValue | yShortValue, intValue);
-
-		value = eval(yChar + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or short : wrong result : ", yCharValue | xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or int : wrong result : ", xCharValue | yIntValue, intValue);
-
-		value = eval(yChar + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or int : wrong result : ", yCharValue | xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char or long : wrong result : ", xCharValue | yLongValue, longValue);
-
-		value = eval(yChar + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char or long : wrong result : ", yCharValue | xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char & {byte, char, short, int, long}
-
-	public void testCharAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and byte : wrong result : ", xCharValue & yByteValue, intValue);
-
-		value = eval(yChar + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and byte : wrong result : ", yCharValue & xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and char : wrong result : ", xCharValue & yCharValue, intValue);
-
-		value = eval(yChar + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and char : wrong result : ", yCharValue & xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and short : wrong result : ", xCharValue & yShortValue, intValue);
-
-		value = eval(yChar + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and short : wrong result : ", yCharValue & xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and int : wrong result : ", xCharValue & yIntValue, intValue);
-
-		value = eval(yChar + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and int : wrong result : ", yCharValue & xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char and long : wrong result : ", xCharValue & yLongValue, longValue);
-
-		value = eval(yChar + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char and long : wrong result : ", yCharValue & xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// char ^ {byte, char, short, int, long}
-
-	public void testCharXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor byte : wrong result : ", xCharValue ^ yByteValue, intValue);
-
-		value = eval(yChar + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor byte : wrong result : ", yCharValue ^ xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor char : wrong result : ", xCharValue ^ yCharValue, intValue);
-
-		value = eval(yChar + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor char : wrong result : ", yCharValue ^ xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor short : wrong result : ", xCharValue ^ yShortValue, intValue);
-
-		value = eval(yChar + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor short : wrong result : ", yCharValue ^ xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor int : wrong result : ", xCharValue ^ yIntValue, intValue);
-
-		value = eval(yChar + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor int : wrong result : ", yCharValue ^ xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char xor long : wrong result : ", xCharValue ^ yLongValue, longValue);
-
-		value = eval(yChar + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char xor long : wrong result : ", yCharValue ^ xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + char
-
-	public void testPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus char : wrong result : ", + xCharValue, intValue);
-
-		value = eval(plusOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus char : wrong result : ", + yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - char
-
-	public void testMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus char : wrong result : ", - xCharValue, intValue);
-
-		value = eval(minusOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus char : wrong result : ", - yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// ~ char
-
-	public void testTwiddleChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle char : wrong result : ", ~ xCharValue, intValue);
-
-		value = eval(twiddleOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle char : wrong result : ", ~ yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
deleted file mode 100644
index ac3788c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,2107 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class DoubleAssignmentOperatorsTests extends Tests {
-
-	public DoubleAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// double += {byte, char, short, int, long, float, double}
-
-	public void testDoublePlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarDouble + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarDouble + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarDouble + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarDouble + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarDouble + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarDouble + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarDouble + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarDouble + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarDouble + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarDouble + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarDouble + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarDouble + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarDouble + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarDouble + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarDouble + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarDouble + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarDouble + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarDouble + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarDouble + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarDouble + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarDouble + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double -= {byte, char, short, int, long, float, double}
-
-	public void testDoubleMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarDouble + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarDouble + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarDouble + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarDouble + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarDouble + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarDouble + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarDouble + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarDouble + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarDouble + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarDouble + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarDouble + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarDouble + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarDouble + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarDouble + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarDouble + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarDouble + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarDouble + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarDouble + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarDouble + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarDouble + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarDouble + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double *= {byte, char, short, int, long, float, double}
-
-	public void testDoubleMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double /= {byte, char, short, int, long, float, double}
-
-	public void testDoubleDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarDouble + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarDouble + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarDouble + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarDouble + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarDouble + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarDouble + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarDouble + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarDouble + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarDouble + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarDouble + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarDouble + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarDouble + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarDouble + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarDouble + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarDouble + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarDouble + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarDouble + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarDouble + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarDouble + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarDouble + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarDouble + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double %= {byte, char, short, int, long, float, double}
-
-	public void testDoubleRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
deleted file mode 100644
index a43438a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
+++ /dev/null
@@ -1,1991 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class DoubleOperatorsTests extends Tests {
-
-	public DoubleOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// double + {byte, char, short, int, long, float, double}
-
-	public void testDoublePlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus byte : wrong result : ", xDoubleValue + yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus byte : wrong result : ", yDoubleValue + xByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus char : wrong result : ", xDoubleValue + yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus char : wrong result : ", yDoubleValue + xCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus short : wrong result : ", xDoubleValue + yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus short : wrong result : ", yDoubleValue + xShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus int : wrong result : ", xDoubleValue + yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus int : wrong result : ", yDoubleValue + xIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus long : wrong result : ", xDoubleValue + yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus long : wrong result : ", yDoubleValue + xLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus float : wrong result : ", xDoubleValue + yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus float : wrong result : ", yDoubleValue + xFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus double : wrong result : ", xDoubleValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus double : wrong result : ", yDoubleValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoublePlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("double plus java.lang.String : wrong result : ", xDoubleValue + yStringValue, stringValue);
-
-		value = eval(yDouble + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("double plus java.lang.String : wrong result : ", yDoubleValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double - {byte, char, short, int, long, float, double}
-
-	public void testDoubleMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus byte : wrong result : ", xDoubleValue - yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus byte : wrong result : ", yDoubleValue - xByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus char : wrong result : ", xDoubleValue - yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus char : wrong result : ", yDoubleValue - xCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus short : wrong result : ", xDoubleValue - yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus short : wrong result : ", yDoubleValue - xShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus int : wrong result : ", xDoubleValue - yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus int : wrong result : ", yDoubleValue - xIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus long : wrong result : ", xDoubleValue - yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus long : wrong result : ", yDoubleValue - xLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus float : wrong result : ", xDoubleValue - yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus float : wrong result : ", yDoubleValue - xFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus double : wrong result : ", xDoubleValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus double : wrong result : ", yDoubleValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double * {byte, char, short, int, long, float, double}
-
-	public void testDoubleMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply byte : wrong result : ", xDoubleValue * yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply byte : wrong result : ", yDoubleValue * xByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply char : wrong result : ", xDoubleValue * yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply char : wrong result : ", yDoubleValue * xCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply short : wrong result : ", xDoubleValue * yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply short : wrong result : ", yDoubleValue * xShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply int : wrong result : ", xDoubleValue * yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply int : wrong result : ", yDoubleValue * xIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply long : wrong result : ", xDoubleValue * yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply long : wrong result : ", yDoubleValue * xLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply float : wrong result : ", xDoubleValue * yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply float : wrong result : ", yDoubleValue * xFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply double : wrong result : ", xDoubleValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply double : wrong result : ", yDoubleValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double / {byte, char, short, int, long, float, double}
-
-	public void testDoubleDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide byte : wrong result : ", xDoubleValue / yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide byte : wrong result : ", yDoubleValue / xByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide char : wrong result : ", xDoubleValue / yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide char : wrong result : ", yDoubleValue / xCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide short : wrong result : ", xDoubleValue / yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide short : wrong result : ", yDoubleValue / xShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide int : wrong result : ", xDoubleValue / yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide int : wrong result : ", yDoubleValue / xIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide long : wrong result : ", xDoubleValue / yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide long : wrong result : ", yDoubleValue / xLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide float : wrong result : ", xDoubleValue / yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide float : wrong result : ", yDoubleValue / xFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide double : wrong result : ", xDoubleValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide double : wrong result : ", yDoubleValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double % {byte, char, short, int, long, float, double}
-
-	public void testDoubleRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder byte : wrong result : ", xDoubleValue % yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder byte : wrong result : ", yDoubleValue % xByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder char : wrong result : ", xDoubleValue % yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder char : wrong result : ", yDoubleValue % xCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder short : wrong result : ", xDoubleValue % yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder short : wrong result : ", yDoubleValue % xShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder int : wrong result : ", xDoubleValue % yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder int : wrong result : ", yDoubleValue % xIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder long : wrong result : ", xDoubleValue % yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder long : wrong result : ", yDoubleValue % xLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder float : wrong result : ", xDoubleValue % yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder float : wrong result : ", yDoubleValue % xFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder double : wrong result : ", xDoubleValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder double : wrong result : ", yDoubleValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double > {byte, char, short, int, long, float, double}
-
-	public void testDoubleGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater byte : wrong result : ", xDoubleValue > yByteValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater byte : wrong result : ", yDoubleValue > xByteValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater byte : wrong result : ", xDoubleValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater char : wrong result : ", xDoubleValue > yCharValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater char : wrong result : ", yDoubleValue > xCharValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater char : wrong result : ", xDoubleValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater short : wrong result : ", xDoubleValue > yShortValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater short : wrong result : ", yDoubleValue > xShortValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater short : wrong result : ", xDoubleValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater int : wrong result : ", xDoubleValue > yIntValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater int : wrong result : ", yDoubleValue > xIntValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater int : wrong result : ", xDoubleValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater long : wrong result : ", xDoubleValue > yLongValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater long : wrong result : ", yDoubleValue > xLongValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater long : wrong result : ", xDoubleValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater float : wrong result : ", xDoubleValue > yFloatValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater float : wrong result : ", yDoubleValue > xFloatValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater float : wrong result : ", xDoubleValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater double : wrong result : ", xDoubleValue > yDoubleValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater double : wrong result : ", yDoubleValue > xDoubleValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater double : wrong result : ", xDoubleValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double >= {byte, char, short, int, long, float, double}
-
-	public void testDoubleGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual byte : wrong result : ", xDoubleValue >= yByteValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual byte : wrong result : ", yDoubleValue >= xByteValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual byte : wrong result : ", xDoubleValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual char : wrong result : ", xDoubleValue >= yCharValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual char : wrong result : ", yDoubleValue >= xCharValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual char : wrong result : ", xDoubleValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual short : wrong result : ", xDoubleValue >= yShortValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual short : wrong result : ", yDoubleValue >= xShortValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual short : wrong result : ", xDoubleValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual int : wrong result : ", xDoubleValue >= yIntValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual int : wrong result : ", yDoubleValue >= xIntValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual int : wrong result : ", xDoubleValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual long : wrong result : ", xDoubleValue >= yLongValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual long : wrong result : ", yDoubleValue >= xLongValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual long : wrong result : ", xDoubleValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual float : wrong result : ", xDoubleValue >= yFloatValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual float : wrong result : ", yDoubleValue >= xFloatValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual float : wrong result : ", xDoubleValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual double : wrong result : ", xDoubleValue >= yDoubleValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual double : wrong result : ", yDoubleValue >= xDoubleValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual double : wrong result : ", xDoubleValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double < {byte, char, short, int, long, float, double}
-
-	public void testDoubleLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less byte : wrong result : ", xDoubleValue < yByteValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less byte : wrong result : ", yDoubleValue < xByteValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less byte : wrong result : ", xDoubleValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less char : wrong result : ", xDoubleValue < yCharValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less char : wrong result : ", yDoubleValue < xCharValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less char : wrong result : ", xDoubleValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less short : wrong result : ", xDoubleValue < yShortValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less short : wrong result : ", yDoubleValue < xShortValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less short : wrong result : ", xDoubleValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less int : wrong result : ", xDoubleValue < yIntValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less int : wrong result : ", yDoubleValue < xIntValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less int : wrong result : ", xDoubleValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less long : wrong result : ", xDoubleValue < yLongValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less long : wrong result : ", yDoubleValue < xLongValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less long : wrong result : ", xDoubleValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less float : wrong result : ", xDoubleValue < yFloatValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less float : wrong result : ", yDoubleValue < xFloatValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less float : wrong result : ", xDoubleValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less double : wrong result : ", xDoubleValue < yDoubleValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less double : wrong result : ", yDoubleValue < xDoubleValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less double : wrong result : ", xDoubleValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double <= {byte, char, short, int, long, float, double}
-
-	public void testDoubleLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual byte : wrong result : ", xDoubleValue <= yByteValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual byte : wrong result : ", yDoubleValue <= xByteValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual byte : wrong result : ", xDoubleValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual char : wrong result : ", xDoubleValue <= yCharValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual char : wrong result : ", yDoubleValue <= xCharValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual char : wrong result : ", xDoubleValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual short : wrong result : ", xDoubleValue <= yShortValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual short : wrong result : ", yDoubleValue <= xShortValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual short : wrong result : ", xDoubleValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual int : wrong result : ", xDoubleValue <= yIntValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual int : wrong result : ", yDoubleValue <= xIntValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual int : wrong result : ", xDoubleValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual long : wrong result : ", xDoubleValue <= yLongValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual long : wrong result : ", yDoubleValue <= xLongValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual long : wrong result : ", xDoubleValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual float : wrong result : ", xDoubleValue <= yFloatValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual float : wrong result : ", yDoubleValue <= xFloatValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual float : wrong result : ", xDoubleValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual double : wrong result : ", xDoubleValue <= yDoubleValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual double : wrong result : ", yDoubleValue <= xDoubleValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual double : wrong result : ", xDoubleValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double == {byte, char, short, int, long, float, double}
-
-	public void testDoubleEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual byte : wrong result : ", xDoubleValue == yByteValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual byte : wrong result : ", yDoubleValue == xByteValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual byte : wrong result : ", xDoubleValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual char : wrong result : ", xDoubleValue == yCharValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual char : wrong result : ", yDoubleValue == xCharValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual char : wrong result : ", xDoubleValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual short : wrong result : ", xDoubleValue == yShortValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual short : wrong result : ", yDoubleValue == xShortValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual short : wrong result : ", xDoubleValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual int : wrong result : ", xDoubleValue == yIntValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual int : wrong result : ", yDoubleValue == xIntValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual int : wrong result : ", xDoubleValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual long : wrong result : ", xDoubleValue == yLongValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual long : wrong result : ", yDoubleValue == xLongValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual long : wrong result : ", xDoubleValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual float : wrong result : ", xDoubleValue == yFloatValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual float : wrong result : ", yDoubleValue == xFloatValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual float : wrong result : ", xDoubleValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual double : wrong result : ", xDoubleValue == yDoubleValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual double : wrong result : ", yDoubleValue == xDoubleValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual double : wrong result : ", xDoubleValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// double != {byte, char, short, int, long, float, double}
-
-	public void testDoubleNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual byte : wrong result : ", xDoubleValue != yByteValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual byte : wrong result : ", yDoubleValue != xByteValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual byte : wrong result : ", xDoubleValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual char : wrong result : ", xDoubleValue != yCharValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual char : wrong result : ", yDoubleValue != xCharValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual char : wrong result : ", xDoubleValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual short : wrong result : ", xDoubleValue != yShortValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual short : wrong result : ", yDoubleValue != xShortValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual short : wrong result : ", xDoubleValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual int : wrong result : ", xDoubleValue != yIntValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual int : wrong result : ", yDoubleValue != xIntValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual int : wrong result : ", xDoubleValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual long : wrong result : ", xDoubleValue != yLongValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual long : wrong result : ", yDoubleValue != xLongValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual long : wrong result : ", xDoubleValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual float : wrong result : ", xDoubleValue != yFloatValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual float : wrong result : ", yDoubleValue != xFloatValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual float : wrong result : ", xDoubleValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual double : wrong result : ", xDoubleValue != yDoubleValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual double : wrong result : ", yDoubleValue != xDoubleValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual double : wrong result : ", xDoubleValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + double
-
-	public void testPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("plus double : wrong result : ", + xDoubleValue, doubleValue, 0);
-
-		value = eval(plusOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("plus double : wrong result : ", + yDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - double
-
-	public void testMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("minus double : wrong result : ", - xDoubleValue, doubleValue, 0);
-
-		value = eval(minusOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("minus double : wrong result : ", - yDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
deleted file mode 100644
index 60d8bea..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class FieldValueTests extends Tests {
-
-	public FieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",63,2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xFieldByteValue, byteValue);
-
-		value = eval("" + yFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yFieldByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xFieldCharValue, charValue);
-
-		value = eval("" + yFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yFieldCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xFieldShortValue, shortValue);
-
-		value = eval("" + yFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yFieldShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xFieldIntValue, intValue);
-
-		value = eval("" + yFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yFieldIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xFieldLongValue, longValue);
-
-		value = eval("" + yFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yFieldLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xFieldFloatValue, floatValue, 0);
-
-		value = eval("" + yFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yFieldFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xFieldDoubleValue, doubleValue, 0);
-
-		value = eval("" + yFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yFieldDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xFieldStringValue, stringValue);
-
-		value = eval("" + yFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yFieldStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xFieldBooleanValue, booleanValue);
-
-		value = eval("" + yFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yFieldBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
deleted file mode 100644
index df1ece6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,2107 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class FloatAssignmentOperatorsTests extends Tests {
-
-	public FloatAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// float += {byte, char, short, int, long, float, double}
-
-	public void testFloatPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarFloat + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarFloat + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarFloat + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarFloat + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarFloat + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarFloat + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarFloat + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarFloat + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarFloat + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarFloat + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarFloat + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarFloat + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarFloat + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarFloat + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarFloat + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarFloat + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarFloat + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarFloat + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarFloat + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarFloat + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarFloat + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float -= {byte, char, short, int, long, float, double}
-
-	public void testFloatMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarFloat + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarFloat + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarFloat + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarFloat + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarFloat + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarFloat + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarFloat + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarFloat + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarFloat + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarFloat + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarFloat + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarFloat + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarFloat + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarFloat + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarFloat + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarFloat + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarFloat + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarFloat + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarFloat + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarFloat + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarFloat + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float *= {byte, char, short, int, long, float, double}
-
-	public void testFloatMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float /= {byte, char, short, int, long, float, double}
-
-	public void testFloatDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarFloat + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarFloat + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarFloat + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarFloat + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarFloat + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarFloat + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarFloat + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarFloat + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarFloat + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarFloat + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarFloat + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarFloat + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarFloat + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarFloat + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarFloat + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarFloat + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarFloat + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarFloat + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarFloat + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarFloat + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarFloat + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float %= {byte, char, short, int, long, float, double}
-
-	public void testFloatRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
deleted file mode 100644
index 17ed861..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
+++ /dev/null
@@ -1,1991 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class FloatOperatorsTests extends Tests {
-
-	public FloatOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// float + {byte, char, short, int, long, float, double}
-
-	public void testFloatPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus byte : wrong result : ", xFloatValue + yByteValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus byte : wrong result : ", yFloatValue + xByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus char : wrong result : ", xFloatValue + yCharValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus char : wrong result : ", yFloatValue + xCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus short : wrong result : ", xFloatValue + yShortValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus short : wrong result : ", yFloatValue + xShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus int : wrong result : ", xFloatValue + yIntValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus int : wrong result : ", yFloatValue + xIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus long : wrong result : ", xFloatValue + yLongValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus long : wrong result : ", yFloatValue + xLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus float : wrong result : ", xFloatValue + yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus float : wrong result : ", yFloatValue + xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float plus double : wrong result : ", xFloatValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float plus double : wrong result : ", yFloatValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("float plus java.lang.String : wrong result : ", xFloatValue + yStringValue, stringValue);
-
-		value = eval(yFloat + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("float plus java.lang.String : wrong result : ", yFloatValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float - {byte, char, short, int, long, float, double}
-
-	public void testFloatMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus byte : wrong result : ", xFloatValue - yByteValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus byte : wrong result : ", yFloatValue - xByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus char : wrong result : ", xFloatValue - yCharValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus char : wrong result : ", yFloatValue - xCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus short : wrong result : ", xFloatValue - yShortValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus short : wrong result : ", yFloatValue - xShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus int : wrong result : ", xFloatValue - yIntValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus int : wrong result : ", yFloatValue - xIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus long : wrong result : ", xFloatValue - yLongValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus long : wrong result : ", yFloatValue - xLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus float : wrong result : ", xFloatValue - yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus float : wrong result : ", yFloatValue - xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float minus double : wrong result : ", xFloatValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float minus double : wrong result : ", yFloatValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float * {byte, char, short, int, long, float, double}
-
-	public void testFloatMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply byte : wrong result : ", xFloatValue * yByteValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply byte : wrong result : ", yFloatValue * xByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply char : wrong result : ", xFloatValue * yCharValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply char : wrong result : ", yFloatValue * xCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply short : wrong result : ", xFloatValue * yShortValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply short : wrong result : ", yFloatValue * xShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply int : wrong result : ", xFloatValue * yIntValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply int : wrong result : ", yFloatValue * xIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply long : wrong result : ", xFloatValue * yLongValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply long : wrong result : ", yFloatValue * xLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply float : wrong result : ", xFloatValue * yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply float : wrong result : ", yFloatValue * xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float multiply double : wrong result : ", xFloatValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float multiply double : wrong result : ", yFloatValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float / {byte, char, short, int, long, float, double}
-
-	public void testFloatDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide byte : wrong result : ", xFloatValue / yByteValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide byte : wrong result : ", yFloatValue / xByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide char : wrong result : ", xFloatValue / yCharValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide char : wrong result : ", yFloatValue / xCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide short : wrong result : ", xFloatValue / yShortValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide short : wrong result : ", yFloatValue / xShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide int : wrong result : ", xFloatValue / yIntValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide int : wrong result : ", yFloatValue / xIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide long : wrong result : ", xFloatValue / yLongValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide long : wrong result : ", yFloatValue / xLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide float : wrong result : ", xFloatValue / yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide float : wrong result : ", yFloatValue / xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float divide double : wrong result : ", xFloatValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float divide double : wrong result : ", yFloatValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float % {byte, char, short, int, long, float, double}
-
-	public void testFloatRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder byte : wrong result : ", xFloatValue % yByteValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder byte : wrong result : ", yFloatValue % xByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder char : wrong result : ", xFloatValue % yCharValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder char : wrong result : ", yFloatValue % xCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder short : wrong result : ", xFloatValue % yShortValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder short : wrong result : ", yFloatValue % xShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder int : wrong result : ", xFloatValue % yIntValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder int : wrong result : ", yFloatValue % xIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder long : wrong result : ", xFloatValue % yLongValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder long : wrong result : ", yFloatValue % xLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder float : wrong result : ", xFloatValue % yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder float : wrong result : ", yFloatValue % xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float remainder double : wrong result : ", xFloatValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float remainder double : wrong result : ", yFloatValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float > {byte, char, short, int, long, float, double}
-
-	public void testFloatGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater byte : wrong result : ", xFloatValue > yByteValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater byte : wrong result : ", yFloatValue > xByteValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater byte : wrong result : ", xFloatValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater char : wrong result : ", xFloatValue > yCharValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater char : wrong result : ", yFloatValue > xCharValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater char : wrong result : ", xFloatValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater short : wrong result : ", xFloatValue > yShortValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater short : wrong result : ", yFloatValue > xShortValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater short : wrong result : ", xFloatValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater int : wrong result : ", xFloatValue > yIntValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater int : wrong result : ", yFloatValue > xIntValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater int : wrong result : ", xFloatValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater long : wrong result : ", xFloatValue > yLongValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater long : wrong result : ", yFloatValue > xLongValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater long : wrong result : ", xFloatValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater float : wrong result : ", xFloatValue > yFloatValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater float : wrong result : ", yFloatValue > xFloatValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater float : wrong result : ", xFloatValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater double : wrong result : ", xFloatValue > yDoubleValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater double : wrong result : ", yFloatValue > xDoubleValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater double : wrong result : ", xFloatValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float >= {byte, char, short, int, long, float, double}
-
-	public void testFloatGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual byte : wrong result : ", xFloatValue >= yByteValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual byte : wrong result : ", yFloatValue >= xByteValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual byte : wrong result : ", xFloatValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual char : wrong result : ", xFloatValue >= yCharValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual char : wrong result : ", yFloatValue >= xCharValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual char : wrong result : ", xFloatValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual short : wrong result : ", xFloatValue >= yShortValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual short : wrong result : ", yFloatValue >= xShortValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual short : wrong result : ", xFloatValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual int : wrong result : ", xFloatValue >= yIntValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual int : wrong result : ", yFloatValue >= xIntValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual int : wrong result : ", xFloatValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual long : wrong result : ", xFloatValue >= yLongValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual long : wrong result : ", yFloatValue >= xLongValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual long : wrong result : ", xFloatValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual float : wrong result : ", xFloatValue >= yFloatValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual float : wrong result : ", yFloatValue >= xFloatValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual float : wrong result : ", xFloatValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual double : wrong result : ", xFloatValue >= yDoubleValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual double : wrong result : ", yFloatValue >= xDoubleValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual double : wrong result : ", xFloatValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float < {byte, char, short, int, long, float, double}
-
-	public void testFloatLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less byte : wrong result : ", xFloatValue < yByteValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less byte : wrong result : ", yFloatValue < xByteValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less byte : wrong result : ", xFloatValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less char : wrong result : ", xFloatValue < yCharValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less char : wrong result : ", yFloatValue < xCharValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less char : wrong result : ", xFloatValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less short : wrong result : ", xFloatValue < yShortValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less short : wrong result : ", yFloatValue < xShortValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less short : wrong result : ", xFloatValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less int : wrong result : ", xFloatValue < yIntValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less int : wrong result : ", yFloatValue < xIntValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less int : wrong result : ", xFloatValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less long : wrong result : ", xFloatValue < yLongValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less long : wrong result : ", yFloatValue < xLongValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less long : wrong result : ", xFloatValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less float : wrong result : ", xFloatValue < yFloatValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less float : wrong result : ", yFloatValue < xFloatValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less float : wrong result : ", xFloatValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less double : wrong result : ", xFloatValue < yDoubleValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less double : wrong result : ", yFloatValue < xDoubleValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less double : wrong result : ", xFloatValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float <= {byte, char, short, int, long, float, double}
-
-	public void testFloatLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual byte : wrong result : ", xFloatValue <= yByteValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual byte : wrong result : ", yFloatValue <= xByteValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual byte : wrong result : ", xFloatValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual char : wrong result : ", xFloatValue <= yCharValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual char : wrong result : ", yFloatValue <= xCharValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual char : wrong result : ", xFloatValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual short : wrong result : ", xFloatValue <= yShortValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual short : wrong result : ", yFloatValue <= xShortValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual short : wrong result : ", xFloatValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual int : wrong result : ", xFloatValue <= yIntValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual int : wrong result : ", yFloatValue <= xIntValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual int : wrong result : ", xFloatValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual long : wrong result : ", xFloatValue <= yLongValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual long : wrong result : ", yFloatValue <= xLongValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual long : wrong result : ", xFloatValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual float : wrong result : ", xFloatValue <= yFloatValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual float : wrong result : ", yFloatValue <= xFloatValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual float : wrong result : ", xFloatValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual double : wrong result : ", xFloatValue <= yDoubleValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual double : wrong result : ", yFloatValue <= xDoubleValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual double : wrong result : ", xFloatValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float == {byte, char, short, int, long, float, double}
-
-	public void testFloatEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual byte : wrong result : ", xFloatValue == yByteValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual byte : wrong result : ", yFloatValue == xByteValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual byte : wrong result : ", xFloatValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual char : wrong result : ", xFloatValue == yCharValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual char : wrong result : ", yFloatValue == xCharValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual char : wrong result : ", xFloatValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual short : wrong result : ", xFloatValue == yShortValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual short : wrong result : ", yFloatValue == xShortValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual short : wrong result : ", xFloatValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual int : wrong result : ", xFloatValue == yIntValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual int : wrong result : ", yFloatValue == xIntValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual int : wrong result : ", xFloatValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual long : wrong result : ", xFloatValue == yLongValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual long : wrong result : ", yFloatValue == xLongValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual long : wrong result : ", xFloatValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual float : wrong result : ", xFloatValue == yFloatValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual float : wrong result : ", yFloatValue == xFloatValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual float : wrong result : ", xFloatValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual double : wrong result : ", xFloatValue == yDoubleValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual double : wrong result : ", yFloatValue == xDoubleValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual double : wrong result : ", xFloatValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// float != {byte, char, short, int, long, float, double}
-
-	public void testFloatNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual byte : wrong result : ", xFloatValue != yByteValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual byte : wrong result : ", yFloatValue != xByteValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual byte : wrong result : ", xFloatValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual char : wrong result : ", xFloatValue != yCharValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual char : wrong result : ", yFloatValue != xCharValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual char : wrong result : ", xFloatValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual short : wrong result : ", xFloatValue != yShortValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual short : wrong result : ", yFloatValue != xShortValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual short : wrong result : ", xFloatValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual int : wrong result : ", xFloatValue != yIntValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual int : wrong result : ", yFloatValue != xIntValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual int : wrong result : ", xFloatValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual long : wrong result : ", xFloatValue != yLongValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual long : wrong result : ", yFloatValue != xLongValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual long : wrong result : ", xFloatValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual float : wrong result : ", xFloatValue != yFloatValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual float : wrong result : ", yFloatValue != xFloatValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual float : wrong result : ", xFloatValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual double : wrong result : ", xFloatValue != yDoubleValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual double : wrong result : ", yFloatValue != xDoubleValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual double : wrong result : ", xFloatValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + float
-
-	public void testPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("plus float : wrong result : ", + xFloatValue, floatValue, 0);
-
-		value = eval(plusOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("plus float : wrong result : ", + yFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - float
-
-	public void testMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("minus float : wrong result : ", - xFloatValue, floatValue, 0);
-
-		value = eval(minusOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("minus float : wrong result : ", - yFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
deleted file mode 100644
index cbc3402..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class IntAssignmentOperatorsTests extends Tests {
-
-	public IntAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// int += {byte, char, short, int, long, float, double}
-
-	public void testIntPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarInt + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarInt + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarInt + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarInt + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarInt + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarInt + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarInt + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarInt + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarInt + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarInt + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarInt + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarInt + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarInt + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarInt + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarInt + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarInt + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarInt + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarInt + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarInt + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int -= {byte, char, short, int, long, float, double}
-
-	public void testIntMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarInt + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarInt + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarInt + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarInt + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarInt + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarInt + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarInt + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarInt + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarInt + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarInt + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarInt + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarInt + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarInt + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarInt + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarInt + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarInt + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarInt + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarInt + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarInt + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarInt + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarInt + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int *= {byte, char, short, int, long, float, double}
-
-	public void testIntMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int /= {byte, char, short, int, long, float, double}
-
-	public void testIntDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarInt + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarInt + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarInt + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarInt + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarInt + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarInt + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarInt + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarInt + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarInt + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarInt + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarInt + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarInt + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarInt + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarInt + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarInt + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarInt + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarInt + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarInt + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarInt + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarInt + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarInt + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int %= {byte, char, short, int, long, float, double}
-
-	public void testIntRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarInt + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarInt + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarInt + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarInt + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarInt + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarInt + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarInt + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarInt + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarInt + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarInt + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarInt + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarInt + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarInt + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarInt + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarInt + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarInt + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarInt + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarInt + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarInt + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarInt + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarInt + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int <<= {byte, char, short, int, long, float, double}
-
-	public void testIntLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int >>= {byte, char, short, int, long, float, double}
-
-	public void testIntRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int >>>= {byte, char, short, int, long, float, double}
-
-	public void testIntUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int |= {byte, char, short, int, long, float, double}
-
-	public void testIntOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarInt + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarInt + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarInt + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarInt + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarInt + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarInt + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarInt + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarInt + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarInt + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarInt + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarInt + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarInt + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarInt + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarInt + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarInt + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int &= {byte, char, short, int, long, float, double}
-
-	public void testIntAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarInt + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarInt + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarInt + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarInt + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarInt + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarInt + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarInt + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarInt + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarInt + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarInt + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarInt + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarInt + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarInt + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarInt + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarInt + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int ^= {byte, char, short, int, long, float, double}
-
-	public void testIntXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarInt + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarInt + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarInt + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarInt + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarInt + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarInt + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarInt + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarInt + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarInt + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarInt + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarInt + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarInt + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarInt + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarInt + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarInt + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
deleted file mode 100644
index 0f1a2eb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class IntOperatorsTests extends Tests {
-
-	public IntOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// int + {byte, char, short, int, long, float, double}
-
-	public void testIntPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus byte : wrong result : ", xIntValue + yByteValue, intValue);
-
-		value = eval(yInt + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus byte : wrong result : ", yIntValue + xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus char : wrong result : ", xIntValue + yCharValue, intValue);
-
-		value = eval(yInt + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus char : wrong result : ", yIntValue + xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus short : wrong result : ", xIntValue + yShortValue, intValue);
-
-		value = eval(yInt + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus short : wrong result : ", yIntValue + xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", xIntValue + yIntValue, intValue);
-
-		value = eval(yInt + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", yIntValue + xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int plus long : wrong result : ", xIntValue + yLongValue, longValue);
-
-		value = eval(yInt + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int plus long : wrong result : ", yIntValue + xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int plus float : wrong result : ", xIntValue + yFloatValue, floatValue, 0);
-
-		value = eval(yInt + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int plus float : wrong result : ", yIntValue + xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int plus double : wrong result : ", xIntValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int plus double : wrong result : ", yIntValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("int plus java.lang.String : wrong result : ", xIntValue + yStringValue, stringValue);
-
-		value = eval(yInt + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("int plus java.lang.String : wrong result : ", yIntValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int - {byte, char, short, int, long, float, double}
-
-	public void testIntMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus byte : wrong result : ", xIntValue - yByteValue, intValue);
-
-		value = eval(yInt + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus byte : wrong result : ", yIntValue - xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus char : wrong result : ", xIntValue - yCharValue, intValue);
-
-		value = eval(yInt + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus char : wrong result : ", yIntValue - xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus short : wrong result : ", xIntValue - yShortValue, intValue);
-
-		value = eval(yInt + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus short : wrong result : ", yIntValue - xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus int : wrong result : ", xIntValue - yIntValue, intValue);
-
-		value = eval(yInt + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus int : wrong result : ", yIntValue - xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int minus long : wrong result : ", xIntValue - yLongValue, longValue);
-
-		value = eval(yInt + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int minus long : wrong result : ", yIntValue - xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int minus float : wrong result : ", xIntValue - yFloatValue, floatValue, 0);
-
-		value = eval(yInt + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int minus float : wrong result : ", yIntValue - xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int minus double : wrong result : ", xIntValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int minus double : wrong result : ", yIntValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int * {byte, char, short, int, long, float, double}
-
-	public void testIntMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply byte : wrong result : ", xIntValue * yByteValue, intValue);
-
-		value = eval(yInt + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply byte : wrong result : ", yIntValue * xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply char : wrong result : ", xIntValue * yCharValue, intValue);
-
-		value = eval(yInt + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply char : wrong result : ", yIntValue * xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply short : wrong result : ", xIntValue * yShortValue, intValue);
-
-		value = eval(yInt + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply short : wrong result : ", yIntValue * xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply int : wrong result : ", xIntValue * yIntValue, intValue);
-
-		value = eval(yInt + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply int : wrong result : ", yIntValue * xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int multiply long : wrong result : ", xIntValue * yLongValue, longValue);
-
-		value = eval(yInt + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int multiply long : wrong result : ", yIntValue * xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int multiply float : wrong result : ", xIntValue * yFloatValue, floatValue, 0);
-
-		value = eval(yInt + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int multiply float : wrong result : ", yIntValue * xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int multiply double : wrong result : ", xIntValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int multiply double : wrong result : ", yIntValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int / {byte, char, short, int, long, float, double}
-
-	public void testIntDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide byte : wrong result : ", xIntValue / yByteValue, intValue);
-
-		value = eval(yInt + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide byte : wrong result : ", yIntValue / xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide char : wrong result : ", xIntValue / yCharValue, intValue);
-
-		value = eval(yInt + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide char : wrong result : ", yIntValue / xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide short : wrong result : ", xIntValue / yShortValue, intValue);
-
-		value = eval(yInt + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide short : wrong result : ", yIntValue / xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide int : wrong result : ", xIntValue / yIntValue, intValue);
-
-		value = eval(yInt + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide int : wrong result : ", yIntValue / xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int divide long : wrong result : ", xIntValue / yLongValue, longValue);
-
-		value = eval(yInt + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int divide long : wrong result : ", yIntValue / xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int divide float : wrong result : ", xIntValue / yFloatValue, floatValue, 0);
-
-		value = eval(yInt + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int divide float : wrong result : ", yIntValue / xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int divide double : wrong result : ", xIntValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int divide double : wrong result : ", yIntValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int % {byte, char, short, int, long, float, double}
-
-	public void testIntRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder byte : wrong result : ", xIntValue % yByteValue, intValue);
-
-		value = eval(yInt + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder byte : wrong result : ", yIntValue % xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder char : wrong result : ", xIntValue % yCharValue, intValue);
-
-		value = eval(yInt + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder char : wrong result : ", yIntValue % xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder short : wrong result : ", xIntValue % yShortValue, intValue);
-
-		value = eval(yInt + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder short : wrong result : ", yIntValue % xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder int : wrong result : ", xIntValue % yIntValue, intValue);
-
-		value = eval(yInt + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder int : wrong result : ", yIntValue % xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int remainder long : wrong result : ", xIntValue % yLongValue, longValue);
-
-		value = eval(yInt + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int remainder long : wrong result : ", yIntValue % xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int remainder float : wrong result : ", xIntValue % yFloatValue, floatValue, 0);
-
-		value = eval(yInt + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int remainder float : wrong result : ", yIntValue % xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int remainder double : wrong result : ", xIntValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int remainder double : wrong result : ", yIntValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int > {byte, char, short, int, long, float, double}
-
-	public void testIntGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater byte : wrong result : ", xIntValue > yByteValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater byte : wrong result : ", yIntValue > xByteValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater byte : wrong result : ", xIntValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater char : wrong result : ", xIntValue > yCharValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater char : wrong result : ", yIntValue > xCharValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater char : wrong result : ", xIntValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater short : wrong result : ", xIntValue > yShortValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater short : wrong result : ", yIntValue > xShortValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater short : wrong result : ", xIntValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater int : wrong result : ", xIntValue > yIntValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater int : wrong result : ", yIntValue > xIntValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater int : wrong result : ", xIntValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater long : wrong result : ", xIntValue > yLongValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater long : wrong result : ", yIntValue > xLongValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater long : wrong result : ", xIntValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater float : wrong result : ", xIntValue > yFloatValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater float : wrong result : ", yIntValue > xFloatValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater float : wrong result : ", xIntValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater double : wrong result : ", xIntValue > yDoubleValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater double : wrong result : ", yIntValue > xDoubleValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater double : wrong result : ", xIntValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int >= {byte, char, short, int, long, float, double}
-
-	public void testIntGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual byte : wrong result : ", xIntValue >= yByteValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual byte : wrong result : ", yIntValue >= xByteValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual byte : wrong result : ", xIntValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual char : wrong result : ", xIntValue >= yCharValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual char : wrong result : ", yIntValue >= xCharValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual char : wrong result : ", xIntValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual short : wrong result : ", xIntValue >= yShortValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual short : wrong result : ", yIntValue >= xShortValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual short : wrong result : ", xIntValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual int : wrong result : ", xIntValue >= yIntValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual int : wrong result : ", yIntValue >= xIntValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual int : wrong result : ", xIntValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual long : wrong result : ", xIntValue >= yLongValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual long : wrong result : ", yIntValue >= xLongValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual long : wrong result : ", xIntValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual float : wrong result : ", xIntValue >= yFloatValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual float : wrong result : ", yIntValue >= xFloatValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual float : wrong result : ", xIntValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual double : wrong result : ", xIntValue >= yDoubleValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual double : wrong result : ", yIntValue >= xDoubleValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual double : wrong result : ", xIntValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int < {byte, char, short, int, long, float, double}
-
-	public void testIntLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less byte : wrong result : ", xIntValue < yByteValue, booleanValue);
-
-		value = eval(yInt + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less byte : wrong result : ", yIntValue < xByteValue, booleanValue);
-
-		value = eval(xInt + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less byte : wrong result : ", xIntValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less char : wrong result : ", xIntValue < yCharValue, booleanValue);
-
-		value = eval(yInt + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less char : wrong result : ", yIntValue < xCharValue, booleanValue);
-
-		value = eval(xInt + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less char : wrong result : ", xIntValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less short : wrong result : ", xIntValue < yShortValue, booleanValue);
-
-		value = eval(yInt + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less short : wrong result : ", yIntValue < xShortValue, booleanValue);
-
-		value = eval(xInt + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less short : wrong result : ", xIntValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less int : wrong result : ", xIntValue < yIntValue, booleanValue);
-
-		value = eval(yInt + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less int : wrong result : ", yIntValue < xIntValue, booleanValue);
-
-		value = eval(xInt + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less int : wrong result : ", xIntValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less long : wrong result : ", xIntValue < yLongValue, booleanValue);
-
-		value = eval(yInt + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less long : wrong result : ", yIntValue < xLongValue, booleanValue);
-
-		value = eval(xInt + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less long : wrong result : ", xIntValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less float : wrong result : ", xIntValue < yFloatValue, booleanValue);
-
-		value = eval(yInt + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less float : wrong result : ", yIntValue < xFloatValue, booleanValue);
-
-		value = eval(xInt + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less float : wrong result : ", xIntValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less double : wrong result : ", xIntValue < yDoubleValue, booleanValue);
-
-		value = eval(yInt + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less double : wrong result : ", yIntValue < xDoubleValue, booleanValue);
-
-		value = eval(xInt + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less double : wrong result : ", xIntValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int <= {byte, char, short, int, long, float, double}
-
-	public void testIntLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual byte : wrong result : ", xIntValue <= yByteValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual byte : wrong result : ", yIntValue <= xByteValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual byte : wrong result : ", xIntValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual char : wrong result : ", xIntValue <= yCharValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual char : wrong result : ", yIntValue <= xCharValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual char : wrong result : ", xIntValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual short : wrong result : ", xIntValue <= yShortValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual short : wrong result : ", yIntValue <= xShortValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual short : wrong result : ", xIntValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual int : wrong result : ", xIntValue <= yIntValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual int : wrong result : ", yIntValue <= xIntValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual int : wrong result : ", xIntValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual long : wrong result : ", xIntValue <= yLongValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual long : wrong result : ", yIntValue <= xLongValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual long : wrong result : ", xIntValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual float : wrong result : ", xIntValue <= yFloatValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual float : wrong result : ", yIntValue <= xFloatValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual float : wrong result : ", xIntValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual double : wrong result : ", xIntValue <= yDoubleValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual double : wrong result : ", yIntValue <= xDoubleValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual double : wrong result : ", xIntValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int == {byte, char, short, int, long, float, double}
-
-	public void testIntEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual byte : wrong result : ", xIntValue == yByteValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual byte : wrong result : ", yIntValue == xByteValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual byte : wrong result : ", xIntValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual char : wrong result : ", xIntValue == yCharValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual char : wrong result : ", yIntValue == xCharValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual char : wrong result : ", xIntValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual short : wrong result : ", xIntValue == yShortValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual short : wrong result : ", yIntValue == xShortValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual short : wrong result : ", xIntValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual int : wrong result : ", xIntValue == yIntValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual int : wrong result : ", yIntValue == xIntValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual int : wrong result : ", xIntValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual long : wrong result : ", xIntValue == yLongValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual long : wrong result : ", yIntValue == xLongValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual long : wrong result : ", xIntValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual float : wrong result : ", xIntValue == yFloatValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual float : wrong result : ", yIntValue == xFloatValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual float : wrong result : ", xIntValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual double : wrong result : ", xIntValue == yDoubleValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual double : wrong result : ", yIntValue == xDoubleValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual double : wrong result : ", xIntValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int != {byte, char, short, int, long, float, double}
-
-	public void testIntNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual byte : wrong result : ", xIntValue != yByteValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual byte : wrong result : ", yIntValue != xByteValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual byte : wrong result : ", xIntValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual char : wrong result : ", xIntValue != yCharValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual char : wrong result : ", yIntValue != xCharValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual char : wrong result : ", xIntValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual short : wrong result : ", xIntValue != yShortValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual short : wrong result : ", yIntValue != xShortValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual short : wrong result : ", xIntValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual int : wrong result : ", xIntValue != yIntValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual int : wrong result : ", yIntValue != xIntValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual int : wrong result : ", xIntValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual long : wrong result : ", xIntValue != yLongValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual long : wrong result : ", yIntValue != xLongValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual long : wrong result : ", xIntValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual float : wrong result : ", xIntValue != yFloatValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual float : wrong result : ", yIntValue != xFloatValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual float : wrong result : ", xIntValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual double : wrong result : ", xIntValue != yDoubleValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual double : wrong result : ", yIntValue != xDoubleValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual double : wrong result : ", xIntValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int << {byte, char, short, int, long}
-
-	public void testIntLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift byte : wrong result : ", xIntValue << yByteValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift byte : wrong result : ", yIntValue << xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift char : wrong result : ", xIntValue << yCharValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift char : wrong result : ", yIntValue << xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift short : wrong result : ", xIntValue << yShortValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift short : wrong result : ", yIntValue << xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift int : wrong result : ", xIntValue << yIntValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift int : wrong result : ", yIntValue << xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift long : wrong result : ", xIntValue << yLongValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift long : wrong result : ", yIntValue << xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int >> {byte, char, short, int, long}
-
-	public void testIntRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift byte : wrong result : ", xIntValue >> yByteValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift byte : wrong result : ", yIntValue >> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift char : wrong result : ", xIntValue >> yCharValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift char : wrong result : ", yIntValue >> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift short : wrong result : ", xIntValue >> yShortValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift short : wrong result : ", yIntValue >> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift int : wrong result : ", xIntValue >> yIntValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift int : wrong result : ", yIntValue >> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift long : wrong result : ", xIntValue >> yLongValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift long : wrong result : ", yIntValue >> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int >>> {byte, char, short, int, long}
-
-	public void testIntUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift byte : wrong result : ", xIntValue >>> yByteValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift byte : wrong result : ", yIntValue >>> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift char : wrong result : ", xIntValue >>> yCharValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift char : wrong result : ", yIntValue >>> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift short : wrong result : ", xIntValue >>> yShortValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift short : wrong result : ", yIntValue >>> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift int : wrong result : ", xIntValue >>> yIntValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift int : wrong result : ", yIntValue >>> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift long : wrong result : ", xIntValue >>> yLongValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift long : wrong result : ", yIntValue >>> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int | {byte, char, short, int, long}
-
-	public void testIntOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or byte : wrong result : ", xIntValue | yByteValue, intValue);
-
-		value = eval(yInt + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or byte : wrong result : ", yIntValue | xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or char : wrong result : ", xIntValue | yCharValue, intValue);
-
-		value = eval(yInt + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or char : wrong result : ", yIntValue | xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or short : wrong result : ", xIntValue | yShortValue, intValue);
-
-		value = eval(yInt + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or short : wrong result : ", yIntValue | xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or int : wrong result : ", xIntValue | yIntValue, intValue);
-
-		value = eval(yInt + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or int : wrong result : ", yIntValue | xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int or long : wrong result : ", xIntValue | yLongValue, longValue);
-
-		value = eval(yInt + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int or long : wrong result : ", yIntValue | xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int & {byte, char, short, int, long}
-
-	public void testIntAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and byte : wrong result : ", xIntValue & yByteValue, intValue);
-
-		value = eval(yInt + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and byte : wrong result : ", yIntValue & xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and char : wrong result : ", xIntValue & yCharValue, intValue);
-
-		value = eval(yInt + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and char : wrong result : ", yIntValue & xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and short : wrong result : ", xIntValue & yShortValue, intValue);
-
-		value = eval(yInt + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and short : wrong result : ", yIntValue & xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and int : wrong result : ", xIntValue & yIntValue, intValue);
-
-		value = eval(yInt + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and int : wrong result : ", yIntValue & xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int and long : wrong result : ", xIntValue & yLongValue, longValue);
-
-		value = eval(yInt + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int and long : wrong result : ", yIntValue & xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// int ^ {byte, char, short, int, long}
-
-	public void testIntXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor byte : wrong result : ", xIntValue ^ yByteValue, intValue);
-
-		value = eval(yInt + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor byte : wrong result : ", yIntValue ^ xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor char : wrong result : ", xIntValue ^ yCharValue, intValue);
-
-		value = eval(yInt + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor char : wrong result : ", yIntValue ^ xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor short : wrong result : ", xIntValue ^ yShortValue, intValue);
-
-		value = eval(yInt + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor short : wrong result : ", yIntValue ^ xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor int : wrong result : ", xIntValue ^ yIntValue, intValue);
-
-		value = eval(yInt + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor int : wrong result : ", yIntValue ^ xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int xor long : wrong result : ", xIntValue ^ yLongValue, longValue);
-
-		value = eval(yInt + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int xor long : wrong result : ", yIntValue ^ xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + int
-
-	public void testPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus int : wrong result : ", + xIntValue, intValue);
-
-		value = eval(plusOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus int : wrong result : ", + yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - int
-
-	public void testMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus int : wrong result : ", - xIntValue, intValue);
-
-		value = eval(minusOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus int : wrong result : ", - yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// ~ int
-
-	public void testTwiddleInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle int : wrong result : ", ~ xIntValue, intValue);
-
-		value = eval(twiddleOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle int : wrong result : ", ~ yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java
deleted file mode 100644
index ec28a49..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class LabelTests extends Tests {
-
-	public LabelTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-	
-	// if break
-	public void testIfBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("a: if (1 == 1) { if (1 == 1) { break a; } return 1; } return 2;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 2, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while break
-	public void testDoWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:do {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {break a;} yVarInt++;}} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while continue
-	public void testDoWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:do {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {continue a;} yVarInt++;}} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 8, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// while break
-	public void testWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:while (xVarInt < 5) {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {break a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// while continue
-	public void testWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:while (xVarInt < 5) {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {continue a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 8, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for break
-	public void testForBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("a:for (xVarInt= 0, yVarInt=0; xVarInt < 5;xVarInt++) {for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {break a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 6, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for continue
-	public void testForContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("a:for (xVarInt= 0, yVarInt=0; xVarInt < 5;xVarInt++) {for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {continue a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 8, intValue);
-		} finally {
-			end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
deleted file mode 100644
index a089241..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class LocalVarAssignmentTests extends Tests {
-
-	public LocalVarAssignmentTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// 
-
-	public void testByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarByte + equalOp +xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(xVarByte + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(yVarByte + equalOp +xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(yVarByte + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", yByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarChar + equalOp +xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", xCharValue, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", xCharValue, charValue);
-
-		value = eval(xVarChar + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", yCharValue, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", yCharValue, charValue);
-
-		value = eval(yVarChar + equalOp +xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", xCharValue, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", xCharValue, charValue);
-
-		value = eval(yVarChar + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", yCharValue, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", yCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarShort + equalOp +xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(xVarShort + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(yVarShort + equalOp +xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(yVarShort + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", yShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarLong + equalOp +xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", xLongValue, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", xLongValue, longValue);
-
-		value = eval(xVarLong + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", yLongValue, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", yLongValue, longValue);
-
-		value = eval(yVarLong + equalOp +xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", xLongValue, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", xLongValue, longValue);
-
-		value = eval(yVarLong + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", yLongValue, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarFloat + equalOp +xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(xVarFloat + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(yVarFloat + equalOp +xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(yVarFloat + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", yFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarDouble + equalOp +xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(xVarDouble + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(yVarDouble + equalOp +xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(yVarDouble + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", yDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarBoolean + equalOp +xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(xVarBoolean + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(yVarBoolean + equalOp +xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(yVarBoolean + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", yBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
deleted file mode 100644
index 7d9a680..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class LocalVarValueTests extends Tests {
-
-	public LocalVarValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// 
-
-	public void testByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", xVarByteValue, byteValue);
-
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", yVarByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", xVarCharValue, charValue);
-
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", yVarCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", xVarShortValue, shortValue);
-
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", yVarShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xVarIntValue, intValue);
-
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yVarIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", xVarLongValue, longValue);
-
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", yVarLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", xVarFloatValue, floatValue, 0);
-
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", yVarFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", xVarDoubleValue, doubleValue, 0);
-
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", yVarDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xVarStringValue, stringValue);
-
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yVarStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", xVarBooleanValue, booleanValue);
-
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", yVarBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
deleted file mode 100644
index 00b3384..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class LongAssignmentOperatorsTests extends Tests {
-
-	public LongAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// long += {byte, char, short, int, long, float, double}
-
-	public void testLongPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarLong + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarLong + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarLong + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarLong + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarLong + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarLong + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarLong + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarLong + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarLong + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarLong + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarLong + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarLong + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarLong + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarLong + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarLong + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarLong + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarLong + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarLong + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarLong + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarLong + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarLong + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long -= {byte, char, short, int, long, float, double}
-
-	public void testLongMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarLong + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarLong + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarLong + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarLong + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarLong + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarLong + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarLong + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarLong + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarLong + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarLong + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarLong + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarLong + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarLong + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarLong + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarLong + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarLong + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarLong + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarLong + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarLong + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarLong + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarLong + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long *= {byte, char, short, int, long, float, double}
-
-	public void testLongMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long /= {byte, char, short, int, long, float, double}
-
-	public void testLongDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarLong + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarLong + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarLong + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarLong + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarLong + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarLong + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarLong + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarLong + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarLong + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarLong + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarLong + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarLong + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarLong + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarLong + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarLong + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarLong + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarLong + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarLong + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarLong + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarLong + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarLong + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long %= {byte, char, short, int, long, float, double}
-
-	public void testLongRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarLong + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarLong + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarLong + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarLong + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarLong + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarLong + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarLong + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarLong + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarLong + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarLong + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarLong + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarLong + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarLong + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarLong + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarLong + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarLong + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarLong + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarLong + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarLong + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarLong + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarLong + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long <<= {byte, char, short, int, long, float, double}
-
-	public void testLongLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long >>= {byte, char, short, int, long, float, double}
-
-	public void testLongRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long >>>= {byte, char, short, int, long, float, double}
-
-	public void testLongUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long |= {byte, char, short, int, long, float, double}
-
-	public void testLongOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarLong + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarLong + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarLong + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarLong + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarLong + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarLong + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarLong + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarLong + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarLong + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarLong + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarLong + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarLong + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarLong + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarLong + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarLong + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long &= {byte, char, short, int, long, float, double}
-
-	public void testLongAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarLong + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarLong + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarLong + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarLong + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarLong + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarLong + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarLong + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarLong + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarLong + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarLong + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarLong + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarLong + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarLong + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarLong + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarLong + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long ^= {byte, char, short, int, long, float, double}
-
-	public void testLongXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarLong + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarLong + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarLong + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarLong + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarLong + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarLong + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarLong + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarLong + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarLong + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarLong + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarLong + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarLong + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarLong + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarLong + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarLong + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
deleted file mode 100644
index 7c36dba..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class LongOperatorsTests extends Tests {
-
-	public LongOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// long + {byte, char, short, int, long, float, double}
-
-	public void testLongPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus byte : wrong result : ", xLongValue + yByteValue, longValue);
-
-		value = eval(yLong + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus byte : wrong result : ", yLongValue + xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus char : wrong result : ", xLongValue + yCharValue, longValue);
-
-		value = eval(yLong + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus char : wrong result : ", yLongValue + xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus short : wrong result : ", xLongValue + yShortValue, longValue);
-
-		value = eval(yLong + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus short : wrong result : ", yLongValue + xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus int : wrong result : ", xLongValue + yIntValue, longValue);
-
-		value = eval(yLong + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus int : wrong result : ", yLongValue + xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus long : wrong result : ", xLongValue + yLongValue, longValue);
-
-		value = eval(yLong + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus long : wrong result : ", yLongValue + xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long plus float : wrong result : ", xLongValue + yFloatValue, floatValue, 0);
-
-		value = eval(yLong + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long plus float : wrong result : ", yLongValue + xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long plus double : wrong result : ", xLongValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long plus double : wrong result : ", yLongValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("long plus java.lang.String : wrong result : ", xLongValue + yStringValue, stringValue);
-
-		value = eval(yLong + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("long plus java.lang.String : wrong result : ", yLongValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long - {byte, char, short, int, long, float, double}
-
-	public void testLongMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus byte : wrong result : ", xLongValue - yByteValue, longValue);
-
-		value = eval(yLong + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus byte : wrong result : ", yLongValue - xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus char : wrong result : ", xLongValue - yCharValue, longValue);
-
-		value = eval(yLong + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus char : wrong result : ", yLongValue - xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus short : wrong result : ", xLongValue - yShortValue, longValue);
-
-		value = eval(yLong + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus short : wrong result : ", yLongValue - xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus int : wrong result : ", xLongValue - yIntValue, longValue);
-
-		value = eval(yLong + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus int : wrong result : ", yLongValue - xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus long : wrong result : ", xLongValue - yLongValue, longValue);
-
-		value = eval(yLong + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus long : wrong result : ", yLongValue - xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long minus float : wrong result : ", xLongValue - yFloatValue, floatValue, 0);
-
-		value = eval(yLong + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long minus float : wrong result : ", yLongValue - xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long minus double : wrong result : ", xLongValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long minus double : wrong result : ", yLongValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long * {byte, char, short, int, long, float, double}
-
-	public void testLongMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply byte : wrong result : ", xLongValue * yByteValue, longValue);
-
-		value = eval(yLong + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply byte : wrong result : ", yLongValue * xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply char : wrong result : ", xLongValue * yCharValue, longValue);
-
-		value = eval(yLong + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply char : wrong result : ", yLongValue * xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply short : wrong result : ", xLongValue * yShortValue, longValue);
-
-		value = eval(yLong + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply short : wrong result : ", yLongValue * xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply int : wrong result : ", xLongValue * yIntValue, longValue);
-
-		value = eval(yLong + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply int : wrong result : ", yLongValue * xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply long : wrong result : ", xLongValue * yLongValue, longValue);
-
-		value = eval(yLong + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply long : wrong result : ", yLongValue * xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long multiply float : wrong result : ", xLongValue * yFloatValue, floatValue, 0);
-
-		value = eval(yLong + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long multiply float : wrong result : ", yLongValue * xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long multiply double : wrong result : ", xLongValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long multiply double : wrong result : ", yLongValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long / {byte, char, short, int, long, float, double}
-
-	public void testLongDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide byte : wrong result : ", xLongValue / yByteValue, longValue);
-
-		value = eval(yLong + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide byte : wrong result : ", yLongValue / xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide char : wrong result : ", xLongValue / yCharValue, longValue);
-
-		value = eval(yLong + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide char : wrong result : ", yLongValue / xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide short : wrong result : ", xLongValue / yShortValue, longValue);
-
-		value = eval(yLong + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide short : wrong result : ", yLongValue / xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide int : wrong result : ", xLongValue / yIntValue, longValue);
-
-		value = eval(yLong + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide int : wrong result : ", yLongValue / xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide long : wrong result : ", xLongValue / yLongValue, longValue);
-
-		value = eval(yLong + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide long : wrong result : ", yLongValue / xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long divide float : wrong result : ", xLongValue / yFloatValue, floatValue, 0);
-
-		value = eval(yLong + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long divide float : wrong result : ", yLongValue / xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long divide double : wrong result : ", xLongValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long divide double : wrong result : ", yLongValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long % {byte, char, short, int, long, float, double}
-
-	public void testLongRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder byte : wrong result : ", xLongValue % yByteValue, longValue);
-
-		value = eval(yLong + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder byte : wrong result : ", yLongValue % xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder char : wrong result : ", xLongValue % yCharValue, longValue);
-
-		value = eval(yLong + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder char : wrong result : ", yLongValue % xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder short : wrong result : ", xLongValue % yShortValue, longValue);
-
-		value = eval(yLong + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder short : wrong result : ", yLongValue % xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder int : wrong result : ", xLongValue % yIntValue, longValue);
-
-		value = eval(yLong + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder int : wrong result : ", yLongValue % xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder long : wrong result : ", xLongValue % yLongValue, longValue);
-
-		value = eval(yLong + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder long : wrong result : ", yLongValue % xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long remainder float : wrong result : ", xLongValue % yFloatValue, floatValue, 0);
-
-		value = eval(yLong + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long remainder float : wrong result : ", yLongValue % xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long remainder double : wrong result : ", xLongValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long remainder double : wrong result : ", yLongValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long > {byte, char, short, int, long, float, double}
-
-	public void testLongGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater byte : wrong result : ", xLongValue > yByteValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater byte : wrong result : ", yLongValue > xByteValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater byte : wrong result : ", xLongValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater char : wrong result : ", xLongValue > yCharValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater char : wrong result : ", yLongValue > xCharValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater char : wrong result : ", xLongValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater short : wrong result : ", xLongValue > yShortValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater short : wrong result : ", yLongValue > xShortValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater short : wrong result : ", xLongValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater int : wrong result : ", xLongValue > yIntValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater int : wrong result : ", yLongValue > xIntValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater int : wrong result : ", xLongValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater long : wrong result : ", xLongValue > yLongValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater long : wrong result : ", yLongValue > xLongValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater long : wrong result : ", xLongValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater float : wrong result : ", xLongValue > yFloatValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater float : wrong result : ", yLongValue > xFloatValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater float : wrong result : ", xLongValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater double : wrong result : ", xLongValue > yDoubleValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater double : wrong result : ", yLongValue > xDoubleValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater double : wrong result : ", xLongValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long >= {byte, char, short, int, long, float, double}
-
-	public void testLongGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual byte : wrong result : ", xLongValue >= yByteValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual byte : wrong result : ", yLongValue >= xByteValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual byte : wrong result : ", xLongValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual char : wrong result : ", xLongValue >= yCharValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual char : wrong result : ", yLongValue >= xCharValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual char : wrong result : ", xLongValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual short : wrong result : ", xLongValue >= yShortValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual short : wrong result : ", yLongValue >= xShortValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual short : wrong result : ", xLongValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual int : wrong result : ", xLongValue >= yIntValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual int : wrong result : ", yLongValue >= xIntValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual int : wrong result : ", xLongValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual long : wrong result : ", xLongValue >= yLongValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual long : wrong result : ", yLongValue >= xLongValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual long : wrong result : ", xLongValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual float : wrong result : ", xLongValue >= yFloatValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual float : wrong result : ", yLongValue >= xFloatValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual float : wrong result : ", xLongValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual double : wrong result : ", xLongValue >= yDoubleValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual double : wrong result : ", yLongValue >= xDoubleValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual double : wrong result : ", xLongValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long < {byte, char, short, int, long, float, double}
-
-	public void testLongLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less byte : wrong result : ", xLongValue < yByteValue, booleanValue);
-
-		value = eval(yLong + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less byte : wrong result : ", yLongValue < xByteValue, booleanValue);
-
-		value = eval(xLong + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less byte : wrong result : ", xLongValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less char : wrong result : ", xLongValue < yCharValue, booleanValue);
-
-		value = eval(yLong + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less char : wrong result : ", yLongValue < xCharValue, booleanValue);
-
-		value = eval(xLong + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less char : wrong result : ", xLongValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less short : wrong result : ", xLongValue < yShortValue, booleanValue);
-
-		value = eval(yLong + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less short : wrong result : ", yLongValue < xShortValue, booleanValue);
-
-		value = eval(xLong + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less short : wrong result : ", xLongValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less int : wrong result : ", xLongValue < yIntValue, booleanValue);
-
-		value = eval(yLong + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less int : wrong result : ", yLongValue < xIntValue, booleanValue);
-
-		value = eval(xLong + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less int : wrong result : ", xLongValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less long : wrong result : ", xLongValue < yLongValue, booleanValue);
-
-		value = eval(yLong + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less long : wrong result : ", yLongValue < xLongValue, booleanValue);
-
-		value = eval(xLong + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less long : wrong result : ", xLongValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less float : wrong result : ", xLongValue < yFloatValue, booleanValue);
-
-		value = eval(yLong + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less float : wrong result : ", yLongValue < xFloatValue, booleanValue);
-
-		value = eval(xLong + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less float : wrong result : ", xLongValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less double : wrong result : ", xLongValue < yDoubleValue, booleanValue);
-
-		value = eval(yLong + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less double : wrong result : ", yLongValue < xDoubleValue, booleanValue);
-
-		value = eval(xLong + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less double : wrong result : ", xLongValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long <= {byte, char, short, int, long, float, double}
-
-	public void testLongLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual byte : wrong result : ", xLongValue <= yByteValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual byte : wrong result : ", yLongValue <= xByteValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual byte : wrong result : ", xLongValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual char : wrong result : ", xLongValue <= yCharValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual char : wrong result : ", yLongValue <= xCharValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual char : wrong result : ", xLongValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual short : wrong result : ", xLongValue <= yShortValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual short : wrong result : ", yLongValue <= xShortValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual short : wrong result : ", xLongValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual int : wrong result : ", xLongValue <= yIntValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual int : wrong result : ", yLongValue <= xIntValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual int : wrong result : ", xLongValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual long : wrong result : ", xLongValue <= yLongValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual long : wrong result : ", yLongValue <= xLongValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual long : wrong result : ", xLongValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual float : wrong result : ", xLongValue <= yFloatValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual float : wrong result : ", yLongValue <= xFloatValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual float : wrong result : ", xLongValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual double : wrong result : ", xLongValue <= yDoubleValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual double : wrong result : ", yLongValue <= xDoubleValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual double : wrong result : ", xLongValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long == {byte, char, short, int, long, float, double}
-
-	public void testLongEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual byte : wrong result : ", xLongValue == yByteValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual byte : wrong result : ", yLongValue == xByteValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual byte : wrong result : ", xLongValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual char : wrong result : ", xLongValue == yCharValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual char : wrong result : ", yLongValue == xCharValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual char : wrong result : ", xLongValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual short : wrong result : ", xLongValue == yShortValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual short : wrong result : ", yLongValue == xShortValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual short : wrong result : ", xLongValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual int : wrong result : ", xLongValue == yIntValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual int : wrong result : ", yLongValue == xIntValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual int : wrong result : ", xLongValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual long : wrong result : ", xLongValue == yLongValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual long : wrong result : ", yLongValue == xLongValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual long : wrong result : ", xLongValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual float : wrong result : ", xLongValue == yFloatValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual float : wrong result : ", yLongValue == xFloatValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual float : wrong result : ", xLongValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual double : wrong result : ", xLongValue == yDoubleValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual double : wrong result : ", yLongValue == xDoubleValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual double : wrong result : ", xLongValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long != {byte, char, short, int, long, float, double}
-
-	public void testLongNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual byte : wrong result : ", xLongValue != yByteValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual byte : wrong result : ", yLongValue != xByteValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual byte : wrong result : ", xLongValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual char : wrong result : ", xLongValue != yCharValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual char : wrong result : ", yLongValue != xCharValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual char : wrong result : ", xLongValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual short : wrong result : ", xLongValue != yShortValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual short : wrong result : ", yLongValue != xShortValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual short : wrong result : ", xLongValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual int : wrong result : ", xLongValue != yIntValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual int : wrong result : ", yLongValue != xIntValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual int : wrong result : ", xLongValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual long : wrong result : ", xLongValue != yLongValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual long : wrong result : ", yLongValue != xLongValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual long : wrong result : ", xLongValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual float : wrong result : ", xLongValue != yFloatValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual float : wrong result : ", yLongValue != xFloatValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual float : wrong result : ", xLongValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual double : wrong result : ", xLongValue != yDoubleValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual double : wrong result : ", yLongValue != xDoubleValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual double : wrong result : ", xLongValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long << {byte, char, short, int, long}
-
-	public void testLongLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift byte : wrong result : ", xLongValue << yByteValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift byte : wrong result : ", yLongValue << xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift char : wrong result : ", xLongValue << yCharValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift char : wrong result : ", yLongValue << xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift short : wrong result : ", xLongValue << yShortValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift short : wrong result : ", yLongValue << xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift int : wrong result : ", xLongValue << yIntValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift int : wrong result : ", yLongValue << xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift long : wrong result : ", xLongValue << yLongValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift long : wrong result : ", yLongValue << xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long >> {byte, char, short, int, long}
-
-	public void testLongRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift byte : wrong result : ", xLongValue >> yByteValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift byte : wrong result : ", yLongValue >> xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift char : wrong result : ", xLongValue >> yCharValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift char : wrong result : ", yLongValue >> xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift short : wrong result : ", xLongValue >> yShortValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift short : wrong result : ", yLongValue >> xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift int : wrong result : ", xLongValue >> yIntValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift int : wrong result : ", yLongValue >> xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift long : wrong result : ", xLongValue >> yLongValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift long : wrong result : ", yLongValue >> xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long >>> {byte, char, short, int, long}
-
-	public void testLongUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift byte : wrong result : ", xLongValue >>> yByteValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift byte : wrong result : ", yLongValue >>> xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift char : wrong result : ", xLongValue >>> yCharValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift char : wrong result : ", yLongValue >>> xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift short : wrong result : ", xLongValue >>> yShortValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift short : wrong result : ", yLongValue >>> xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift int : wrong result : ", xLongValue >>> yIntValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift int : wrong result : ", yLongValue >>> xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift long : wrong result : ", xLongValue >>> yLongValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift long : wrong result : ", yLongValue >>> xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long | {byte, char, short, int, long}
-
-	public void testLongOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or byte : wrong result : ", xLongValue | yByteValue, longValue);
-
-		value = eval(yLong + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or byte : wrong result : ", yLongValue | xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or char : wrong result : ", xLongValue | yCharValue, longValue);
-
-		value = eval(yLong + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or char : wrong result : ", yLongValue | xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or short : wrong result : ", xLongValue | yShortValue, longValue);
-
-		value = eval(yLong + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or short : wrong result : ", yLongValue | xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or int : wrong result : ", xLongValue | yIntValue, longValue);
-
-		value = eval(yLong + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or int : wrong result : ", yLongValue | xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or long : wrong result : ", xLongValue | yLongValue, longValue);
-
-		value = eval(yLong + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or long : wrong result : ", yLongValue | xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long & {byte, char, short, int, long}
-
-	public void testLongAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and byte : wrong result : ", xLongValue & yByteValue, longValue);
-
-		value = eval(yLong + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and byte : wrong result : ", yLongValue & xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and char : wrong result : ", xLongValue & yCharValue, longValue);
-
-		value = eval(yLong + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and char : wrong result : ", yLongValue & xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and short : wrong result : ", xLongValue & yShortValue, longValue);
-
-		value = eval(yLong + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and short : wrong result : ", yLongValue & xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and int : wrong result : ", xLongValue & yIntValue, longValue);
-
-		value = eval(yLong + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and int : wrong result : ", yLongValue & xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and long : wrong result : ", xLongValue & yLongValue, longValue);
-
-		value = eval(yLong + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and long : wrong result : ", yLongValue & xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// long ^ {byte, char, short, int, long}
-
-	public void testLongXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor byte : wrong result : ", xLongValue ^ yByteValue, longValue);
-
-		value = eval(yLong + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor byte : wrong result : ", yLongValue ^ xByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor char : wrong result : ", xLongValue ^ yCharValue, longValue);
-
-		value = eval(yLong + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor char : wrong result : ", yLongValue ^ xCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor short : wrong result : ", xLongValue ^ yShortValue, longValue);
-
-		value = eval(yLong + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor short : wrong result : ", yLongValue ^ xShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor int : wrong result : ", xLongValue ^ yIntValue, longValue);
-
-		value = eval(yLong + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor int : wrong result : ", yLongValue ^ xIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor long : wrong result : ", xLongValue ^ yLongValue, longValue);
-
-		value = eval(yLong + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor long : wrong result : ", yLongValue ^ xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + long
-
-	public void testPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("plus long : wrong result : ", + xLongValue, longValue);
-
-		value = eval(plusOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("plus long : wrong result : ", + yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - long
-
-	public void testMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("minus long : wrong result : ", - xLongValue, longValue);
-
-		value = eval(minusOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("minus long : wrong result : ", - yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// ~ long
-
-	public void testTwiddleLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("twiddle long : wrong result : ", ~ xLongValue, longValue);
-
-		value = eval(twiddleOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("twiddle long : wrong result : ", ~ yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java
deleted file mode 100644
index 3047813..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class LoopTests extends Tests {
-
-	public LoopTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// while
-	public void testWhile() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; while (xVarInt < 5) {xVarInt++; yVarInt++;} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 5, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while
-	public void testDoWhile() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; do {xVarInt++; yVarInt++;} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 5, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for
-	public void testFor() throws Throwable {
-		try {
-			init();
-			IValue value = eval("for (xVarInt= 0, yVarInt=0; xVarInt < 5; xVarInt++) {yVarInt++;}  return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 5, intValue);
-		} finally {
-			end();
-		}
-	}
-	
-	// while break
-	public void testWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; while (xVarInt < 5) {xVarInt++; if (xVarInt == 3) {break;} yVarInt++;} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 2, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while break
-	public void testDoWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; do {xVarInt++; if (xVarInt == 3) {break;} yVarInt++;} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 2, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for break
-	public void testForBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("for (xVarInt= 0, yVarInt=0; xVarInt < 5; xVarInt++) {if (xVarInt == 3) {break;} yVarInt++;}  return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 3, intValue);
-		} finally {
-			end();
-		}
-	}
-	
-	// while continue
-	public void testWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; while (xVarInt < 5) {xVarInt++; if (xVarInt == 3) {continue;} yVarInt++;} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while continue
-	public void testDoWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; do {xVarInt++; if (xVarInt == 3) {continue;} yVarInt++;} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for continue
-	public void testForContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("for (xVarInt= 0, yVarInt=0; xVarInt < 5; xVarInt++) {if (xVarInt == 3) {continue;} yVarInt++;}  return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-	}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java
deleted file mode 100644
index 89ef0bf..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java
+++ /dev/null
@@ -1,917 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_109 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_109(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 120, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_A_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_A_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java
deleted file mode 100644
index 348b940..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java
+++ /dev/null
@@ -1,917 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_134 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_134(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 145, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_A_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_A_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java
deleted file mode 100644
index 40f53d6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java
+++ /dev/null
@@ -1,1106 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_144 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_144(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 155, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(THIS + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(THIS + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java
deleted file mode 100644
index 68ee580..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_168 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_168(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 179, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java
deleted file mode 100644
index ffdbbda..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_192 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_192(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 203, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
deleted file mode 100644
index 3c805a5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
+++ /dev/null
@@ -1,980 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_203 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_203(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 214, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AA + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AA + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AA + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java
deleted file mode 100644
index d4fbbae..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_241 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_241(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 252, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java
deleted file mode 100644
index a1dbf26..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_268 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_268(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 279, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java
deleted file mode 100644
index a7582f5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_293 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_293(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 304, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
deleted file mode 100644
index b05760b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
+++ /dev/null
@@ -1,1211 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_304 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_304(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 315, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_1, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_1, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(THIS + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(THIS + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_BB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_BB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_BB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java
deleted file mode 100644
index 3ecade9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_343 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_343(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 354, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java
deleted file mode 100644
index 1430636..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_370 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_370(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 381, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java
deleted file mode 100644
index 7b7320a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_395 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_395(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 206, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
deleted file mode 100644
index d6eb20b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
+++ /dev/null
@@ -1,854 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_406 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_406(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 417, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_1, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_1, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java
deleted file mode 100644
index 21994db..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_444 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_444(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 455, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java
deleted file mode 100644
index 1a784ed..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_470 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_470(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 481, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java
deleted file mode 100644
index 1c4be8b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_495 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_495(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 506, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
deleted file mode 100644
index 220a5de..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
+++ /dev/null
@@ -1,854 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_506 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_506(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 517, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_1, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_1, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java
deleted file mode 100644
index 3c09bf6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java
+++ /dev/null
@@ -1,1106 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_518 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_518(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 529, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(THIS + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(THIS + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(I_B + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(I_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(I_B + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(I_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_BB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_BB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_BB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java
deleted file mode 100644
index 496c449..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java
+++ /dev/null
@@ -1,1064 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_54 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_54(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 65, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java
deleted file mode 100644
index ad02330..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_555 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_555(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 566, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java
deleted file mode 100644
index 74c3e64..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java
+++ /dev/null
@@ -1,875 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_58 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_58(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 69, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java
deleted file mode 100644
index 6ad5579..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_581 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_581(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 592, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java
deleted file mode 100644
index 8a96c83..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_605 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_605(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 616, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java
deleted file mode 100644
index fe7884b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java
+++ /dev/null
@@ -1,686 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_615 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_615(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 626, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java
deleted file mode 100644
index de06e89..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_653 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_653(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 664, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java
deleted file mode 100644
index 1819132..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_679 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_679(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 690, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java
deleted file mode 100644
index 13b3c0a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_703 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_703(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 714, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java
deleted file mode 100644
index f5f44d2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java
+++ /dev/null
@@ -1,686 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_713 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_713(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 724, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java
deleted file mode 100644
index f4c8a19..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java
+++ /dev/null
@@ -1,1043 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_728 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_728(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 739, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(I_A + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(I_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(I_A + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(I_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AA + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AA + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AA + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java
deleted file mode 100644
index 3b1477a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java
+++ /dev/null
@@ -1,1169 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_83 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_83(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 94, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_A_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_A_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
deleted file mode 100644
index e28c673..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
+++ /dev/null
@@ -1,1075 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class NumericTypesCastTests extends Tests {
-
-	public NumericTypesCastTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// (byte) {byte, char, short, int, long, float, double}
-
-	public void testByteCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) byte : wrong result : ", ( byte) xByteValue, byteValue);
-
-		value = eval("(byte)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) byte : wrong result : ", ( byte) yByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) char : wrong result : ", ( byte) xCharValue, byteValue);
-
-		value = eval("(byte)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) char : wrong result : ", ( byte) yCharValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) short : wrong result : ", ( byte) xShortValue, byteValue);
-
-		value = eval("(byte)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) short : wrong result : ", ( byte) yShortValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) int : wrong result : ", ( byte) xIntValue, byteValue);
-
-		value = eval("(byte)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) int : wrong result : ", ( byte) yIntValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) long : wrong result : ", ( byte) xLongValue, byteValue);
-
-		value = eval("(byte)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) long : wrong result : ", ( byte) yLongValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) float : wrong result : ", ( byte) xFloatValue, byteValue);
-
-		value = eval("(byte)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) float : wrong result : ", ( byte) yFloatValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testByteCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) double : wrong result : ", ( byte) xDoubleValue, byteValue);
-
-		value = eval("(byte)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) double : wrong result : ", ( byte) yDoubleValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// (char) {byte, char, short, int, long, float, double}
-
-	public void testCharCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) byte : wrong result : ", ( char) xByteValue, charValue);
-
-		value = eval("(char)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) byte : wrong result : ", ( char) yByteValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) char : wrong result : ", ( char) xCharValue, charValue);
-
-		value = eval("(char)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) char : wrong result : ", ( char) yCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) short : wrong result : ", ( char) xShortValue, charValue);
-
-		value = eval("(char)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) short : wrong result : ", ( char) yShortValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) int : wrong result : ", ( char) xIntValue, charValue);
-
-		value = eval("(char)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) int : wrong result : ", ( char) yIntValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) long : wrong result : ", ( char) xLongValue, charValue);
-
-		value = eval("(char)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) long : wrong result : ", ( char) yLongValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) float : wrong result : ", ( char) xFloatValue, charValue);
-
-		value = eval("(char)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) float : wrong result : ", ( char) yFloatValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) double : wrong result : ", ( char) xDoubleValue, charValue);
-
-		value = eval("(char)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) double : wrong result : ", ( char) yDoubleValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// (short) {byte, char, short, int, long, float, double}
-
-	public void testShortCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) byte : wrong result : ", ( short) xByteValue, shortValue);
-
-		value = eval("(short)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) byte : wrong result : ", ( short) yByteValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) char : wrong result : ", ( short) xCharValue, shortValue);
-
-		value = eval("(short)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) char : wrong result : ", ( short) yCharValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) short : wrong result : ", ( short) xShortValue, shortValue);
-
-		value = eval("(short)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) short : wrong result : ", ( short) yShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) int : wrong result : ", ( short) xIntValue, shortValue);
-
-		value = eval("(short)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) int : wrong result : ", ( short) yIntValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) long : wrong result : ", ( short) xLongValue, shortValue);
-
-		value = eval("(short)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) long : wrong result : ", ( short) yLongValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) float : wrong result : ", ( short) xFloatValue, shortValue);
-
-		value = eval("(short)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) float : wrong result : ", ( short) yFloatValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) double : wrong result : ", ( short) xDoubleValue, shortValue);
-
-		value = eval("(short)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) double : wrong result : ", ( short) yDoubleValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// (int) {byte, char, short, int, long, float, double}
-
-	public void testIntCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) byte : wrong result : ", ( int) xByteValue, intValue);
-
-		value = eval("(int)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) byte : wrong result : ", ( int) yByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) char : wrong result : ", ( int) xCharValue, intValue);
-
-		value = eval("(int)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) char : wrong result : ", ( int) yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) short : wrong result : ", ( int) xShortValue, intValue);
-
-		value = eval("(int)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) short : wrong result : ", ( int) yShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) int : wrong result : ", ( int) xIntValue, intValue);
-
-		value = eval("(int)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) int : wrong result : ", ( int) yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) long : wrong result : ", ( int) xLongValue, intValue);
-
-		value = eval("(int)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) long : wrong result : ", ( int) yLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) float : wrong result : ", ( int) xFloatValue, intValue);
-
-		value = eval("(int)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) float : wrong result : ", ( int) yFloatValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) double : wrong result : ", ( int) xDoubleValue, intValue);
-
-		value = eval("(int)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) double : wrong result : ", ( int) yDoubleValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// (long) {byte, char, short, int, long, float, double}
-
-	public void testLongCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) byte : wrong result : ", ( long) xByteValue, longValue);
-
-		value = eval("(long)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) byte : wrong result : ", ( long) yByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) char : wrong result : ", ( long) xCharValue, longValue);
-
-		value = eval("(long)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) char : wrong result : ", ( long) yCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) short : wrong result : ", ( long) xShortValue, longValue);
-
-		value = eval("(long)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) short : wrong result : ", ( long) yShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) int : wrong result : ", ( long) xIntValue, longValue);
-
-		value = eval("(long)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) int : wrong result : ", ( long) yIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) long : wrong result : ", ( long) xLongValue, longValue);
-
-		value = eval("(long)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) long : wrong result : ", ( long) yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) float : wrong result : ", ( long) xFloatValue, longValue);
-
-		value = eval("(long)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) float : wrong result : ", ( long) yFloatValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) double : wrong result : ", ( long) xDoubleValue, longValue);
-
-		value = eval("(long)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) double : wrong result : ", ( long) yDoubleValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// (float) {byte, char, short, int, long, float, double}
-
-	public void testFloatCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) byte : wrong result : ", ( float) xByteValue, floatValue, 0);
-
-		value = eval("(float)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) byte : wrong result : ", ( float) yByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) char : wrong result : ", ( float) xCharValue, floatValue, 0);
-
-		value = eval("(float)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) char : wrong result : ", ( float) yCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) short : wrong result : ", ( float) xShortValue, floatValue, 0);
-
-		value = eval("(float)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) short : wrong result : ", ( float) yShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) int : wrong result : ", ( float) xIntValue, floatValue, 0);
-
-		value = eval("(float)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) int : wrong result : ", ( float) yIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) long : wrong result : ", ( float) xLongValue, floatValue, 0);
-
-		value = eval("(float)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) long : wrong result : ", ( float) yLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) float : wrong result : ", ( float) xFloatValue, floatValue, 0);
-
-		value = eval("(float)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) float : wrong result : ", ( float) yFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) double : wrong result : ", ( float) xDoubleValue, floatValue, 0);
-
-		value = eval("(float)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) double : wrong result : ", ( float) yDoubleValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// (double) {byte, char, short, int, long, float, double}
-
-	public void testDoubleCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) byte : wrong result : ", ( double) xByteValue, doubleValue, 0);
-
-		value = eval("(double)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) byte : wrong result : ", ( double) yByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) char : wrong result : ", ( double) xCharValue, doubleValue, 0);
-
-		value = eval("(double)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) char : wrong result : ", ( double) yCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) short : wrong result : ", ( double) xShortValue, doubleValue, 0);
-
-		value = eval("(double)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) short : wrong result : ", ( double) yShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) int : wrong result : ", ( double) xIntValue, doubleValue, 0);
-
-		value = eval("(double)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) int : wrong result : ", ( double) yIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) long : wrong result : ", ( double) xLongValue, doubleValue, 0);
-
-		value = eval("(double)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) long : wrong result : ", ( double) yLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) float : wrong result : ", ( double) xFloatValue, doubleValue, 0);
-
-		value = eval("(double)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) float : wrong result : ", ( double) yFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) double : wrong result : ", ( double) xDoubleValue, doubleValue, 0);
-
-		value = eval("(double)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) double : wrong result : ", ( double) yDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
deleted file mode 100644
index f1c3971..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class QualifiedFieldValueTests extends Tests {
-
-	public QualifiedFieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",73,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xFieldByteValue, byteValue);
-
-		value = eval("foo." + yFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yFieldByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xFieldCharValue, charValue);
-
-		value = eval("foo." + yFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yFieldCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xFieldShortValue, shortValue);
-
-		value = eval("foo." + yFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yFieldShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xFieldIntValue, intValue);
-
-		value = eval("foo." + yFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yFieldIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xFieldLongValue, longValue);
-
-		value = eval("foo." + yFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yFieldLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xFieldFloatValue, floatValue, 0);
-
-		value = eval("foo." + yFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yFieldFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xFieldDoubleValue, doubleValue, 0);
-
-		value = eval("foo." + yFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yFieldDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xFieldStringValue, stringValue);
-
-		value = eval("foo." + yFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yFieldStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xFieldBooleanValue, booleanValue);
-
-		value = eval("foo." + yFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yFieldBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
deleted file mode 100644
index 3338a58..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class QualifiedStaticFieldValueTests extends Tests {
-
-	public QualifiedStaticFieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",73,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("foo." + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("foo." + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("foo." + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("foo." + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("foo." + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("foo." + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("foo." + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("foo." + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("foo." + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
deleted file mode 100644
index aab4d25..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class QualifiedStaticFieldValueTests2 extends Tests {
-
-	public QualifiedStaticFieldValueTests2(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",73,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("EvalTypeTests." + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("EvalTypeTests." + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
deleted file mode 100644
index 6dd9909..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class ShortAssignmentOperatorsTests extends Tests {
-
-	public ShortAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// short += {byte, char, short, int, long, float, double}
-
-	public void testShortPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarShort + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarShort + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarShort + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarShort + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarShort + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarShort + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarShort + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarShort + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarShort + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarShort + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarShort + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarShort + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarShort + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarShort + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarShort + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarShort + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarShort + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarShort + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarShort + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarShort + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarShort + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short -= {byte, char, short, int, long, float, double}
-
-	public void testShortMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarShort + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarShort + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarShort + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarShort + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarShort + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarShort + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarShort + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarShort + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarShort + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarShort + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarShort + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarShort + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarShort + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarShort + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarShort + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarShort + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarShort + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarShort + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarShort + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarShort + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarShort + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short *= {byte, char, short, int, long, float, double}
-
-	public void testShortMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short /= {byte, char, short, int, long, float, double}
-
-	public void testShortDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarShort + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarShort + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarShort + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarShort + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarShort + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarShort + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarShort + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarShort + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarShort + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarShort + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarShort + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarShort + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarShort + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarShort + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarShort + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarShort + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarShort + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarShort + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarShort + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarShort + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarShort + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short %= {byte, char, short, int, long, float, double}
-
-	public void testShortRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarShort + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarShort + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarShort + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarShort + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarShort + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarShort + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarShort + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarShort + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarShort + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarShort + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarShort + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarShort + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarShort + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarShort + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarShort + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarShort + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarShort + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarShort + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarShort + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarShort + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarShort + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short <<= {byte, char, short, int, long, float, double}
-
-	public void testShortLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short >>= {byte, char, short, int, long, float, double}
-
-	public void testShortRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short >>>= {byte, char, short, int, long, float, double}
-
-	public void testShortUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short |= {byte, char, short, int, long, float, double}
-
-	public void testShortOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarShort + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarShort + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarShort + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarShort + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarShort + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarShort + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarShort + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarShort + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarShort + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarShort + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarShort + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarShort + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarShort + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarShort + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarShort + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short &= {byte, char, short, int, long, float, double}
-
-	public void testShortAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarShort + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarShort + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarShort + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarShort + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarShort + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarShort + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarShort + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarShort + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarShort + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarShort + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarShort + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarShort + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarShort + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarShort + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarShort + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short ^= {byte, char, short, int, long, float, double}
-
-	public void testShortXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarShort + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarShort + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarShort + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarShort + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarShort + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarShort + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarShort + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarShort + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarShort + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarShort + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarShort + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarShort + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarShort + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarShort + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarShort + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
deleted file mode 100644
index 78f2397..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ShortOperatorsTests extends Tests {
-
-	public ShortOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// short + {byte, char, short, int, long, float, double}
-
-	public void testShortPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus byte : wrong result : ", xShortValue + yByteValue, intValue);
-
-		value = eval(yShort + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus byte : wrong result : ", yShortValue + xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus char : wrong result : ", xShortValue + yCharValue, intValue);
-
-		value = eval(yShort + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus char : wrong result : ", yShortValue + xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus short : wrong result : ", xShortValue + yShortValue, intValue);
-
-		value = eval(yShort + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus short : wrong result : ", yShortValue + xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus int : wrong result : ", xShortValue + yIntValue, intValue);
-
-		value = eval(yShort + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus int : wrong result : ", yShortValue + xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short plus long : wrong result : ", xShortValue + yLongValue, longValue);
-
-		value = eval(yShort + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short plus long : wrong result : ", yShortValue + xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short plus float : wrong result : ", xShortValue + yFloatValue, floatValue, 0);
-
-		value = eval(yShort + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short plus float : wrong result : ", yShortValue + xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short plus double : wrong result : ", xShortValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short plus double : wrong result : ", yShortValue + xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("short plus java.lang.String : wrong result : ", xShortValue + yStringValue, stringValue);
-
-		value = eval(yShort + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("short plus java.lang.String : wrong result : ", yShortValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short - {byte, char, short, int, long, float, double}
-
-	public void testShortMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus byte : wrong result : ", xShortValue - yByteValue, intValue);
-
-		value = eval(yShort + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus byte : wrong result : ", yShortValue - xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus char : wrong result : ", xShortValue - yCharValue, intValue);
-
-		value = eval(yShort + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus char : wrong result : ", yShortValue - xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus short : wrong result : ", xShortValue - yShortValue, intValue);
-
-		value = eval(yShort + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus short : wrong result : ", yShortValue - xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus int : wrong result : ", xShortValue - yIntValue, intValue);
-
-		value = eval(yShort + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus int : wrong result : ", yShortValue - xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short minus long : wrong result : ", xShortValue - yLongValue, longValue);
-
-		value = eval(yShort + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short minus long : wrong result : ", yShortValue - xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short minus float : wrong result : ", xShortValue - yFloatValue, floatValue, 0);
-
-		value = eval(yShort + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short minus float : wrong result : ", yShortValue - xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short minus double : wrong result : ", xShortValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short minus double : wrong result : ", yShortValue - xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short * {byte, char, short, int, long, float, double}
-
-	public void testShortMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply byte : wrong result : ", xShortValue * yByteValue, intValue);
-
-		value = eval(yShort + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply byte : wrong result : ", yShortValue * xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply char : wrong result : ", xShortValue * yCharValue, intValue);
-
-		value = eval(yShort + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply char : wrong result : ", yShortValue * xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply short : wrong result : ", xShortValue * yShortValue, intValue);
-
-		value = eval(yShort + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply short : wrong result : ", yShortValue * xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply int : wrong result : ", xShortValue * yIntValue, intValue);
-
-		value = eval(yShort + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply int : wrong result : ", yShortValue * xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short multiply long : wrong result : ", xShortValue * yLongValue, longValue);
-
-		value = eval(yShort + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short multiply long : wrong result : ", yShortValue * xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short multiply float : wrong result : ", xShortValue * yFloatValue, floatValue, 0);
-
-		value = eval(yShort + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short multiply float : wrong result : ", yShortValue * xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short multiply double : wrong result : ", xShortValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short multiply double : wrong result : ", yShortValue * xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short / {byte, char, short, int, long, float, double}
-
-	public void testShortDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide byte : wrong result : ", xShortValue / yByteValue, intValue);
-
-		value = eval(yShort + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide byte : wrong result : ", yShortValue / xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide char : wrong result : ", xShortValue / yCharValue, intValue);
-
-		value = eval(yShort + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide char : wrong result : ", yShortValue / xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide short : wrong result : ", xShortValue / yShortValue, intValue);
-
-		value = eval(yShort + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide short : wrong result : ", yShortValue / xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide int : wrong result : ", xShortValue / yIntValue, intValue);
-
-		value = eval(yShort + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide int : wrong result : ", yShortValue / xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short divide long : wrong result : ", xShortValue / yLongValue, longValue);
-
-		value = eval(yShort + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short divide long : wrong result : ", yShortValue / xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short divide float : wrong result : ", xShortValue / yFloatValue, floatValue, 0);
-
-		value = eval(yShort + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short divide float : wrong result : ", yShortValue / xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short divide double : wrong result : ", xShortValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short divide double : wrong result : ", yShortValue / xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short % {byte, char, short, int, long, float, double}
-
-	public void testShortRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder byte : wrong result : ", xShortValue % yByteValue, intValue);
-
-		value = eval(yShort + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder byte : wrong result : ", yShortValue % xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder char : wrong result : ", xShortValue % yCharValue, intValue);
-
-		value = eval(yShort + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder char : wrong result : ", yShortValue % xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder short : wrong result : ", xShortValue % yShortValue, intValue);
-
-		value = eval(yShort + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder short : wrong result : ", yShortValue % xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder int : wrong result : ", xShortValue % yIntValue, intValue);
-
-		value = eval(yShort + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder int : wrong result : ", yShortValue % xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short remainder long : wrong result : ", xShortValue % yLongValue, longValue);
-
-		value = eval(yShort + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short remainder long : wrong result : ", yShortValue % xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short remainder float : wrong result : ", xShortValue % yFloatValue, floatValue, 0);
-
-		value = eval(yShort + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short remainder float : wrong result : ", yShortValue % xFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short remainder double : wrong result : ", xShortValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short remainder double : wrong result : ", yShortValue % xDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short > {byte, char, short, int, long, float, double}
-
-	public void testShortGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater byte : wrong result : ", xShortValue > yByteValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater byte : wrong result : ", yShortValue > xByteValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater byte : wrong result : ", xShortValue > xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater char : wrong result : ", xShortValue > yCharValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater char : wrong result : ", yShortValue > xCharValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater char : wrong result : ", xShortValue > xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater short : wrong result : ", xShortValue > yShortValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater short : wrong result : ", yShortValue > xShortValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater short : wrong result : ", xShortValue > xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater int : wrong result : ", xShortValue > yIntValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater int : wrong result : ", yShortValue > xIntValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater int : wrong result : ", xShortValue > xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater long : wrong result : ", xShortValue > yLongValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater long : wrong result : ", yShortValue > xLongValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater long : wrong result : ", xShortValue > xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater float : wrong result : ", xShortValue > yFloatValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater float : wrong result : ", yShortValue > xFloatValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater float : wrong result : ", xShortValue > xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater double : wrong result : ", xShortValue > yDoubleValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater double : wrong result : ", yShortValue > xDoubleValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater double : wrong result : ", xShortValue > xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short >= {byte, char, short, int, long, float, double}
-
-	public void testShortGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual byte : wrong result : ", xShortValue >= yByteValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual byte : wrong result : ", yShortValue >= xByteValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual byte : wrong result : ", xShortValue >= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual char : wrong result : ", xShortValue >= yCharValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual char : wrong result : ", yShortValue >= xCharValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual char : wrong result : ", xShortValue >= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual short : wrong result : ", xShortValue >= yShortValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual short : wrong result : ", yShortValue >= xShortValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual short : wrong result : ", xShortValue >= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual int : wrong result : ", xShortValue >= yIntValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual int : wrong result : ", yShortValue >= xIntValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual int : wrong result : ", xShortValue >= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual long : wrong result : ", xShortValue >= yLongValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual long : wrong result : ", yShortValue >= xLongValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual long : wrong result : ", xShortValue >= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual float : wrong result : ", xShortValue >= yFloatValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual float : wrong result : ", yShortValue >= xFloatValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual float : wrong result : ", xShortValue >= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual double : wrong result : ", xShortValue >= yDoubleValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual double : wrong result : ", yShortValue >= xDoubleValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual double : wrong result : ", xShortValue >= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short < {byte, char, short, int, long, float, double}
-
-	public void testShortLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less byte : wrong result : ", xShortValue < yByteValue, booleanValue);
-
-		value = eval(yShort + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less byte : wrong result : ", yShortValue < xByteValue, booleanValue);
-
-		value = eval(xShort + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less byte : wrong result : ", xShortValue < xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less char : wrong result : ", xShortValue < yCharValue, booleanValue);
-
-		value = eval(yShort + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less char : wrong result : ", yShortValue < xCharValue, booleanValue);
-
-		value = eval(xShort + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less char : wrong result : ", xShortValue < xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less short : wrong result : ", xShortValue < yShortValue, booleanValue);
-
-		value = eval(yShort + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less short : wrong result : ", yShortValue < xShortValue, booleanValue);
-
-		value = eval(xShort + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less short : wrong result : ", xShortValue < xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less int : wrong result : ", xShortValue < yIntValue, booleanValue);
-
-		value = eval(yShort + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less int : wrong result : ", yShortValue < xIntValue, booleanValue);
-
-		value = eval(xShort + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less int : wrong result : ", xShortValue < xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less long : wrong result : ", xShortValue < yLongValue, booleanValue);
-
-		value = eval(yShort + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less long : wrong result : ", yShortValue < xLongValue, booleanValue);
-
-		value = eval(xShort + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less long : wrong result : ", xShortValue < xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less float : wrong result : ", xShortValue < yFloatValue, booleanValue);
-
-		value = eval(yShort + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less float : wrong result : ", yShortValue < xFloatValue, booleanValue);
-
-		value = eval(xShort + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less float : wrong result : ", xShortValue < xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less double : wrong result : ", xShortValue < yDoubleValue, booleanValue);
-
-		value = eval(yShort + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less double : wrong result : ", yShortValue < xDoubleValue, booleanValue);
-
-		value = eval(xShort + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less double : wrong result : ", xShortValue < xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short <= {byte, char, short, int, long, float, double}
-
-	public void testShortLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual byte : wrong result : ", xShortValue <= yByteValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual byte : wrong result : ", yShortValue <= xByteValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual byte : wrong result : ", xShortValue <= xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual char : wrong result : ", xShortValue <= yCharValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual char : wrong result : ", yShortValue <= xCharValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual char : wrong result : ", xShortValue <= xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual short : wrong result : ", xShortValue <= yShortValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual short : wrong result : ", yShortValue <= xShortValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual short : wrong result : ", xShortValue <= xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual int : wrong result : ", xShortValue <= yIntValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual int : wrong result : ", yShortValue <= xIntValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual int : wrong result : ", xShortValue <= xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual long : wrong result : ", xShortValue <= yLongValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual long : wrong result : ", yShortValue <= xLongValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual long : wrong result : ", xShortValue <= xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual float : wrong result : ", xShortValue <= yFloatValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual float : wrong result : ", yShortValue <= xFloatValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual float : wrong result : ", xShortValue <= xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual double : wrong result : ", xShortValue <= yDoubleValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual double : wrong result : ", yShortValue <= xDoubleValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual double : wrong result : ", xShortValue <= xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short == {byte, char, short, int, long, float, double}
-
-	public void testShortEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual byte : wrong result : ", xShortValue == yByteValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual byte : wrong result : ", yShortValue == xByteValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual byte : wrong result : ", xShortValue == xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual char : wrong result : ", xShortValue == yCharValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual char : wrong result : ", yShortValue == xCharValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual char : wrong result : ", xShortValue == xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual short : wrong result : ", xShortValue == yShortValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual short : wrong result : ", yShortValue == xShortValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual short : wrong result : ", xShortValue == xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual int : wrong result : ", xShortValue == yIntValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual int : wrong result : ", yShortValue == xIntValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual int : wrong result : ", xShortValue == xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual long : wrong result : ", xShortValue == yLongValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual long : wrong result : ", yShortValue == xLongValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual long : wrong result : ", xShortValue == xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual float : wrong result : ", xShortValue == yFloatValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual float : wrong result : ", yShortValue == xFloatValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual float : wrong result : ", xShortValue == xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual double : wrong result : ", xShortValue == yDoubleValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual double : wrong result : ", yShortValue == xDoubleValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual double : wrong result : ", xShortValue == xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short != {byte, char, short, int, long, float, double}
-
-	public void testShortNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual byte : wrong result : ", xShortValue != yByteValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual byte : wrong result : ", yShortValue != xByteValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual byte : wrong result : ", xShortValue != xByteValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual char : wrong result : ", xShortValue != yCharValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual char : wrong result : ", yShortValue != xCharValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual char : wrong result : ", xShortValue != xCharValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual short : wrong result : ", xShortValue != yShortValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual short : wrong result : ", yShortValue != xShortValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual short : wrong result : ", xShortValue != xShortValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual int : wrong result : ", xShortValue != yIntValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual int : wrong result : ", yShortValue != xIntValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual int : wrong result : ", xShortValue != xIntValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual long : wrong result : ", xShortValue != yLongValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual long : wrong result : ", yShortValue != xLongValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual long : wrong result : ", xShortValue != xLongValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual float : wrong result : ", xShortValue != yFloatValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual float : wrong result : ", yShortValue != xFloatValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual float : wrong result : ", xShortValue != xFloatValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual double : wrong result : ", xShortValue != yDoubleValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual double : wrong result : ", yShortValue != xDoubleValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual double : wrong result : ", xShortValue != xDoubleValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short << {byte, char, short, int, long}
-
-	public void testShortLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift byte : wrong result : ", xShortValue << yByteValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift byte : wrong result : ", yShortValue << xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift char : wrong result : ", xShortValue << yCharValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift char : wrong result : ", yShortValue << xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift short : wrong result : ", xShortValue << yShortValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift short : wrong result : ", yShortValue << xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift int : wrong result : ", xShortValue << yIntValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift int : wrong result : ", yShortValue << xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift long : wrong result : ", xShortValue << yLongValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift long : wrong result : ", yShortValue << xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short >> {byte, char, short, int, long}
-
-	public void testShortRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift byte : wrong result : ", xShortValue >> yByteValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift byte : wrong result : ", yShortValue >> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift char : wrong result : ", xShortValue >> yCharValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift char : wrong result : ", yShortValue >> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift short : wrong result : ", xShortValue >> yShortValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift short : wrong result : ", yShortValue >> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift int : wrong result : ", xShortValue >> yIntValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift int : wrong result : ", yShortValue >> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift long : wrong result : ", xShortValue >> yLongValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift long : wrong result : ", yShortValue >> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short >>> {byte, char, short, int, long}
-
-	public void testShortUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift byte : wrong result : ", xShortValue >>> yByteValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift byte : wrong result : ", yShortValue >>> xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift char : wrong result : ", xShortValue >>> yCharValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift char : wrong result : ", yShortValue >>> xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift short : wrong result : ", xShortValue >>> yShortValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift short : wrong result : ", yShortValue >>> xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift int : wrong result : ", xShortValue >>> yIntValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift int : wrong result : ", yShortValue >>> xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift long : wrong result : ", xShortValue >>> yLongValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift long : wrong result : ", yShortValue >>> xLongValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short | {byte, char, short, int, long}
-
-	public void testShortOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or byte : wrong result : ", xShortValue | yByteValue, intValue);
-
-		value = eval(yShort + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or byte : wrong result : ", yShortValue | xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or char : wrong result : ", xShortValue | yCharValue, intValue);
-
-		value = eval(yShort + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or char : wrong result : ", yShortValue | xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or short : wrong result : ", xShortValue | yShortValue, intValue);
-
-		value = eval(yShort + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or short : wrong result : ", yShortValue | xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or int : wrong result : ", xShortValue | yIntValue, intValue);
-
-		value = eval(yShort + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or int : wrong result : ", yShortValue | xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short or long : wrong result : ", xShortValue | yLongValue, longValue);
-
-		value = eval(yShort + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short or long : wrong result : ", yShortValue | xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short & {byte, char, short, int, long}
-
-	public void testShortAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and byte : wrong result : ", xShortValue & yByteValue, intValue);
-
-		value = eval(yShort + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and byte : wrong result : ", yShortValue & xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and char : wrong result : ", xShortValue & yCharValue, intValue);
-
-		value = eval(yShort + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and char : wrong result : ", yShortValue & xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and short : wrong result : ", xShortValue & yShortValue, intValue);
-
-		value = eval(yShort + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and short : wrong result : ", yShortValue & xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and int : wrong result : ", xShortValue & yIntValue, intValue);
-
-		value = eval(yShort + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and int : wrong result : ", yShortValue & xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short and long : wrong result : ", xShortValue & yLongValue, longValue);
-
-		value = eval(yShort + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short and long : wrong result : ", yShortValue & xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// short ^ {byte, char, short, int, long}
-
-	public void testShortXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor byte : wrong result : ", xShortValue ^ yByteValue, intValue);
-
-		value = eval(yShort + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor byte : wrong result : ", yShortValue ^ xByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor char : wrong result : ", xShortValue ^ yCharValue, intValue);
-
-		value = eval(yShort + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor char : wrong result : ", yShortValue ^ xCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor short : wrong result : ", xShortValue ^ yShortValue, intValue);
-
-		value = eval(yShort + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor short : wrong result : ", yShortValue ^ xShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor int : wrong result : ", xShortValue ^ yIntValue, intValue);
-
-		value = eval(yShort + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor int : wrong result : ", yShortValue ^ xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short xor long : wrong result : ", xShortValue ^ yLongValue, longValue);
-
-		value = eval(yShort + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short xor long : wrong result : ", yShortValue ^ xLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// + short
-
-	public void testPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus short : wrong result : ", + xShortValue, intValue);
-
-		value = eval(plusOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus short : wrong result : ", + yShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// - short
-
-	public void testMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus short : wrong result : ", - xShortValue, intValue);
-
-		value = eval(minusOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus short : wrong result : ", - yShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// ~ short
-
-	public void testTwiddleShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle short : wrong result : ", ~ xShortValue, intValue);
-
-		value = eval(twiddleOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle short : wrong result : ", ~ yShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
deleted file mode 100644
index 2394f84..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StaticFieldValueTests extends Tests {
-
-	public StaticFieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",63,2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("" + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("" + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("" + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("" + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("" + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("" + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("" + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("" + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("" + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
deleted file mode 100644
index 08a4b24..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StaticFieldValueTests2 extends Tests {
-
-	public StaticFieldValueTests2(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",67,2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("" + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("" + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("" + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("" + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("" + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("" + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("" + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("" + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("" + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
deleted file mode 100644
index 1c0075a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StringPlusAssignmentOpTests extends Tests {
-
-	public StringPlusAssignmentOpTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// java.lang.String += {byte, char, short, int, long, java.lang.String, null}
-
-	public void testStringPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarString + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarString + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarString + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarString + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarString + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarString + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarString + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarString + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarString + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarString + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarString + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarString + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarString + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarString + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarString + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarString + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarString + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarString + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarString + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarString + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarString + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentString() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xStringValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yStringValue;
-		value = eval(xVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xStringValue;
-		value = eval(yVarString + plusAssignmentOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yStringValue;
-		value = eval(yVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentNull() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xNullValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xNull);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yNullValue;
-		value = eval(xVarString + plusAssignmentOp + yNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xNullValue;
-		value = eval(yVarString + plusAssignmentOp + xNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yNullValue;
-		value = eval(yVarString + plusAssignmentOp + yNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
deleted file mode 100644
index 106ba2b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StringPlusOpTests extends Tests {
-
-	public StringPlusOpTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// java.lang.String + {byte, char, short, int, long, java.lang.String, null}
-
-	public void testStringPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus byte : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus byte : wrong result : ", xStringValue + yByteValue, stringValue);
-
-		value = eval(yString + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus byte : wrong result : ", yStringValue + xByteValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus char : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus char : wrong result : ", xStringValue + yCharValue, stringValue);
-
-		value = eval(yString + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus char : wrong result : ", yStringValue + xCharValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus short : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus short : wrong result : ", xStringValue + yShortValue, stringValue);
-
-		value = eval(yString + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus short : wrong result : ", yStringValue + xShortValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus int : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus int : wrong result : ", xStringValue + yIntValue, stringValue);
-
-		value = eval(yString + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus int : wrong result : ", yStringValue + xIntValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus long : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus long : wrong result : ", xStringValue + yLongValue, stringValue);
-
-		value = eval(yString + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus long : wrong result : ", yStringValue + xLongValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus double : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus double : wrong result : ", xStringValue + yDoubleValue, stringValue);
-
-		value = eval(yString + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus double : wrong result : ", yStringValue + xDoubleValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus boolean : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus boolean : wrong result : ", xStringValue + yBooleanValue, stringValue);
-
-		value = eval(yString + plusOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus boolean : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus boolean : wrong result : ", yStringValue + xBooleanValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", xStringValue + yStringValue, stringValue);
-
-		value = eval(yString + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", yStringValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusNull() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yNull);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus null : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus null : wrong result : ", xStringValue + yNullValue, stringValue);
-
-		value = eval(yString + plusOp + xNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus null : wrong result : ", yStringValue + xNullValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
deleted file mode 100644
index 5462344..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
+++ /dev/null
@@ -1,511 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.dom.Message;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.eval.EvaluationManager;
-import org.eclipse.jdt.debug.eval.IEvaluationEngine;
-import org.eclipse.jdt.debug.eval.IEvaluationListener;
-import org.eclipse.jdt.debug.eval.IEvaluationResult;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public abstract class Tests extends AbstractDebugTest {
-
-	static final String xByte = "((byte)-3)";
-	static final String xChar = "((char)-3)";
-	static final String xShort = "((short)-3)";
-	static final String xInt = "(-3)";
-	static final String xLong = "(-3l)";
-	static final String xFloat = "(-3.2f)";
-	static final String xDouble = "(-3.2)";
-	static final String xString = "\"minus three\"";
-	static final String xBoolean = "true";
-	static final String xNull = "null";
-	
-	static final byte xByteValue = (byte)-3;
-	static final char xCharValue = (char)-3;
-	static final short xShortValue = (short)-3;
-	static final int xIntValue = -3;
-	static final long xLongValue = -3l;
-	static final float xFloatValue = -3.2f;
-	static final double xDoubleValue = -3.2;
-	static final String xStringValue = "minus three";
-	static final boolean xBooleanValue = true;
-	static final Object xNullValue = null;
-
-	static final String xVarByte = "xVarByte";
-	static final String xVarChar = "xVarChar";
-	static final String xVarShort = "xVarShort";
-	static final String xVarInt = "xVarInt";
-	static final String xVarLong = "xVarLong";
-	static final String xVarFloat = "xVarFloat";
-	static final String xVarDouble = "xVarDouble";
-	static final String xVarString = "xVarString";
-	static final String xVarBoolean = "xVarBoolean";
-//	static final String xVarNull = "xVarNull";
-	
-	static final byte xVarByteValue = (byte)-5;
-	static final char xVarCharValue = (char)-5;
-	static final short xVarShortValue = (short)-5;
-	static final int xVarIntValue = -5;
-	static final long xVarLongValue = (long)-5;
-	static final float xVarFloatValue = (float)-5.3;
-	static final double xVarDoubleValue = -5.3;
-	static final String xVarStringValue = "minus five";
-	static final boolean xVarBooleanValue = true;
-//	static final Object xVarNullValue = null;
-
-	static final String yByte = "((byte)8)";
-	static final String yChar = "((char)8)";
-	static final String yShort = "((short)8)";
-	static final String yInt = "8";
-	static final String yLong = "8l";
-	static final String yFloat = "7.8f";
-	static final String yDouble = "7.8";
-	static final String yString = "\"eight\"";
-	static final String yBoolean = "false";
-	static final String yNull = "null";
-
-	static final byte yByteValue = (byte)8;
-	static final char yCharValue = (char)8;
-	static final short yShortValue = (short)8;
-	static final int yIntValue = 8;
-	static final long yLongValue = (long)8;
-	static final float yFloatValue = (float)7.8;
-	static final double yDoubleValue = 7.8;
-	static final String yStringValue = "eight";
-	static final boolean yBooleanValue = false;
-	static final Object yNullValue = null;
-	
-	static final String yVarByte = "yVarByte";
-	static final String yVarChar = "yVarChar";
-	static final String yVarShort = "yVarShort";
-	static final String yVarInt = "yVarInt";
-	static final String yVarLong = "yVarLong";
-	static final String yVarFloat = "yVarFloat";
-	static final String yVarDouble = "yVarDouble";
-	static final String yVarString = "yVarString";
-	static final String yVarBoolean = "yVarBoolean";
-//	static final String yVarNull = "yVarNull";
-	
-	static final byte yVarByteValue = (byte)7;
-	static final char yVarCharValue = (char)7;
-	static final short yVarShortValue = (short)7;
-	static final int yVarIntValue = 7;
-	static final long yVarLongValue = (long)7;
-	static final float yVarFloatValue = (float)6.9;
-	static final double yVarDoubleValue = 6.9;
-	static final String yVarStringValue = "seven";
-	static final boolean yVarBooleanValue = false;
-//	static final Object yVarNullValue = null;
-	
-	static final String xFieldByte = "xFieldByte";
-	static final String xFieldChar = "xFieldChar";
-	static final String xFieldShort = "xFieldShort";
-	static final String xFieldInt = "xFieldInt";
-	static final String xFieldLong = "xFieldLong";
-	static final String xFieldFloat = "xFieldFloat";
-	static final String xFieldDouble = "xFieldDouble";
-	static final String xFieldString = "xFieldString";
-	static final String xFieldBoolean = "xFieldBoolean";
-
-	static final String yFieldByte = "yFieldByte";
-	static final String yFieldChar = "yFieldChar";
-	static final String yFieldShort = "yFieldShort";
-	static final String yFieldInt = "yFieldInt";
-	static final String yFieldLong = "yFieldLong";
-	static final String yFieldFloat = "yFieldFloat";
-	static final String yFieldDouble = "yFieldDouble";
-	static final String yFieldString = "yFieldString";
-	static final String yFieldBoolean = "yFieldBoolean";
-
-	static final String xStaticFieldByte = "xStaticFieldByte";
-	static final String xStaticFieldChar = "xStaticFieldChar";
-	static final String xStaticFieldShort = "xStaticFieldShort";
-	static final String xStaticFieldInt = "xStaticFieldInt";
-	static final String xStaticFieldLong = "xStaticFieldLong";
-	static final String xStaticFieldFloat = "xStaticFieldFloat";
-	static final String xStaticFieldDouble = "xStaticFieldDouble";
-	static final String xStaticFieldString = "xStaticFieldString";
-	static final String xStaticFieldBoolean = "xStaticFieldBoolean";
-
-	static final String yStaticFieldByte = "yStaticFieldByte";
-	static final String yStaticFieldChar = "yStaticFieldChar";
-	static final String yStaticFieldShort = "yStaticFieldShort";
-	static final String yStaticFieldInt = "yStaticFieldInt";
-	static final String yStaticFieldLong = "yStaticFieldLong";
-	static final String yStaticFieldFloat = "yStaticFieldFloat";
-	static final String yStaticFieldDouble = "yStaticFieldDouble";
-	static final String yStaticFieldString = "yStaticFieldString";
-	static final String yStaticFieldBoolean = "yStaticFieldBoolean";
-	
-	static final byte xFieldByteValue = -2;
-	static final char xFieldCharValue = (char)-2;
-	static final short xFieldShortValue = -2;
-	static final int xFieldIntValue = -2;
-	static final long xFieldLongValue = -2;
-	static final float xFieldFloatValue = (float)-2.1;
-	static final double xFieldDoubleValue = -2.1;
-	static final String xFieldStringValue = "minus two";
-	static final boolean xFieldBooleanValue = true;
-
-	static final byte yFieldByteValue = 9;
-	static final char yFieldCharValue = 9;
-	static final short yFieldShortValue = 9;
-	static final int yFieldIntValue = 9;
-	static final long yFieldLongValue = 9;
-	static final float yFieldFloatValue = (float)8.6;
-	static final double yFieldDoubleValue = 8.6;
-	static final String yFieldStringValue = "nine";
-	static final boolean yFieldBooleanValue = false;
-
-	static final byte xStaticFieldByteValue = -1;
-	static final char xStaticFieldCharValue = (char)-1;
-	static final short xStaticFieldShortValue = -1;
-	static final int xStaticFieldIntValue = -1;
-	static final long xStaticFieldLongValue = -1;
-	static final float xStaticFieldFloatValue = (float)-1.5;
-	static final double xStaticFieldDoubleValue = -1.5;
-	static final String xStaticFieldStringValue = "minus one";
-	static final boolean xStaticFieldBooleanValue = true;
-
-	static final byte yStaticFieldByteValue = 6;
-	static final char yStaticFieldCharValue = 6;
-	static final short yStaticFieldShortValue = 6;
-	static final int yStaticFieldIntValue = 6;
-	static final long yStaticFieldLongValue = 6;
-	static final float yStaticFieldFloatValue = (float)6.5;
-	static final double yStaticFieldDoubleValue = 6.5;
-	static final String yStaticFieldStringValue = "six";
-	static final boolean yStaticFieldBooleanValue = false;
-	
-	static final String xArrayByte = "xArrayByte";
-	static final String xArrayChar = "xArrayChar";
-	static final String xArrayShort = "xArrayShort";
-	static final String xArrayInt = "xArrayInt";
-	static final String xArrayLong = "xArrayLong";
-	static final String xArrayFloat = "xArrayFloat";
-	static final String xArrayDouble = "xArrayDouble";
-	static final String xArrayString = "xArrayString";
-	static final String xArrayBoolean = "xArrayBoolean";
-
-	static final String yArrayByte = "yArrayByte";
-	static final String yArrayChar = "yArrayChar";
-	static final String yArrayShort = "yArrayShort";
-	static final String yArrayInt = "yArrayInt";
-	static final String yArrayLong = "yArrayLong";
-	static final String yArrayFloat = "yArrayFloat";
-	static final String yArrayDouble = "yArrayDouble";
-	static final String yArrayString = "yArrayString";
-	static final String yArrayBoolean = "yArrayBoolean";
-
-	static final byte[] xArrayByteValue = new byte[]{1, 2, 3};
-	static final char[] xArrayCharValue = new char[]{1, 2, 3};
-	static final short[] xArrayShortValue = new short[]{1, 2, 3};
-	static final int[] xArrayIntValue = new int[]{1, 2, 3};
-	static final long[] xArrayLongValue = new long[]{1, 2, 3};
-	static final float[] xArrayFloatValue = new float[]{(float)1.2, (float)2.3, (float)3.4};
-	static final double[] xArrayDoubleValue = new double[]{1.2, 2.3, 3.4};
-	static final String[] xArrayStringValue = new String[]{"one", "two", "three"};
-	static final boolean[] xArrayBooleanValue = new boolean[]{true, false, true};
-
-	static final byte[] yArrayByteValue = new byte[]{7, 8, 9};
-	static final char[] yArrayCharValue = new char[]{7, 8, 9};
-	static final short[] yArrayShortValue = new short[]{7, 8, 9};
-	static final int[] yArrayIntValue = new int[]{7, 8, 9};
-	static final long[] yArrayLongValue = new long[]{7, 8, 9};
-	static final float[] yArrayFloatValue = new float[]{(float)7.6, (float)8.7, (float)9.8};
-	static final double[] yArrayDoubleValue = new double[]{7.6, 8.7, 9.8};
-	static final String[] yArrayStringValue = new String[]{"seven", "eight", "nine"};
-	static final boolean[] yArrayBooleanValue = new boolean[]{false, true, false};
-		
-	
-	static final String plusOp = "+";
-	static final String minusOp = "-";
-	static final String multiplyOp = "*";
-	static final String divideOp = "/";
-	static final String remainderOp = "%";
-	static final String greaterOp = ">";
-	static final String greaterEqualOp = ">=";
-	static final String lessOp = "<";
-	static final String lessEqualOp = "<=";
-	static final String equalEqualOp = "==";
-	static final String notEqualOp = "!=";
-	static final String leftShiftOp = "<<";
-	static final String rightShiftOp = ">>";
-	static final String unsignedRightShiftOp = ">>>";
-	static final String orOp = "|";
-	static final String andOp = "&";
-	static final String xorOp = "^";
-	static final String notOp = "!";
-	static final String twiddleOp = "~";
-	static final String equalOp = "=";
-	static final String plusAssignmentOp = "+=";
-	static final String minusAssignmentOp = "-=";
-	static final String multiplyAssignmentOp = "*=";
-	static final String divideAssignmentOp = "/=";
-	static final String remainderAssignmentOp = "%=";
-	static final String leftShiftAssignmentOp = "<<=";
-	static final String rightShiftAssignmentOp = ">>=";
-	static final String unsignedRightShiftAssignmentOp = ">>>=";
-	static final String orAssignmentOp = "|=";
-	static final String andAssignmentOp = "&=";
-	static final String xorAssignmentOp = "^=";
-	static final String prefixPlusPlusOp = "++";
-	static final String postfixPlusPlusOp = "++";
-	static final String prefixMinusMinusOp = "--";
-	static final String postfixMinusMinusOp = "--";
-	
-	
-	static final String aInt = "a";
-	static final String bInt = "b";
-	static final String cInt = "c";
-	static final String dInt = "d";
-	static final String eInt = "e";
-	static final String fInt = "f";
-	static final String gInt = "g";
-	static final String hInt = "h";
-	static final String iInt = "i";
-	static final String jInt = "j";
-
-	static final String aString = "aa";
-	static final String bString = "bb";
-	static final String cString = "cc";
-	static final String dString = "dd";
-	static final String eString = "ee";
-	static final String fString = "ff";
-	static final String gString = "gg";
-	static final String hString = "hh";
-	static final String iString = "ii";
-	static final String jString = "jj";
-
-	static final int aIntValue_0 = 1;
-	static final int bIntValue_0 = 2;
-	static final int cIntValue_0 = 3;
-	static final int dIntValue_0 = 4;
-	static final int eIntValue_0 = 5;
-	static final int fIntValue_0 = 6;
-	static final int aIntValue_1 = 1;
-	static final int bIntValue_1 = 2;
-	static final int cIntValue_1 = 37;
-	static final int dIntValue_1 = 48;
-	static final int eIntValue_1 = 5;
-	static final int fIntValue_1 = 6;
-	static final int gIntValue_1 = 7;
-	static final int hIntValue_1 = 8;
-	static final int aIntValue_2 = 1;
-	static final int bIntValue_2 = 2;
-	static final int cIntValue_2 = 379;
-	static final int dIntValue_2 = 480;
-	static final int eIntValue_2 = 59;
-	static final int fIntValue_2 = 60;
-	static final int gIntValue_2 = 7;
-	static final int hIntValue_2 = 8;
-	static final int iIntValue_2 = 9;
-	static final int jIntValue_2 = 0;
-
-
-	static final String aStringValue_0 = "one";
-	static final String bStringValue_0 = "two";
-	static final String cStringValue_0 = "three";
-	static final String dStringValue_0 = "four";
-	static final String eStringValue_0 = "five";
-	static final String fStringValue_0 = "six";
-	static final String aStringValue_1 = "one";
-	static final String bStringValue_1 = "two";
-	static final String cStringValue_1 = "three seven";
-	static final String dStringValue_1 = "four eight";
-	static final String eStringValue_1 = "five";
-	static final String fStringValue_1 = "six";
-	static final String gStringValue_1 = "seven";
-	static final String hStringValue_1 = "eight";
-	static final String aStringValue_2 = "one";
-	static final String bStringValue_2 = "two";
-	static final String cStringValue_2 = "three seven nine";
-	static final String dStringValue_2 = "four eight zero";
-	static final String eStringValue_2 = "five nine";
-	static final String fStringValue_2 = "six zero";
-	static final String gStringValue_2 = "seven";
-	static final String hStringValue_2 = "eight";
-	static final String iStringValue_2 = "nine";
-	static final String jStringValue_2 = "zero";
-	
-	static final String EMPTY= "";
-	static final String THIS= "this.";
-	static final String T_T= "EvalNestedTypeTests.";
-	static final String T_T_A= T_T + "A.";
-	static final String T_A= "A.";
-	static final String T_T_A_AA= T_T_A + "AA.";
-	static final String T_A_AA= T_A + "AA.";
-	static final String T_AA= "AA.";
-	static final String T_T_A_AB= T_T_A + "AB.";
-	static final String T_A_AB= T_A + "AB.";
-	static final String T_AB= "AB.";
-	static final String T_T_B= T_T + "B.";
-	static final String T_B= "B.";
-	static final String T_T_B_BB= T_T_B + "BB.";
-	static final String T_B_BB= T_B + "BB.";
-	static final String T_BB= "BB.";
-	static final String T_C= "C.";
-	static final String T_E= "E.";
-
-	static final String T_T_this= T_T + "this.";
-	static final String T_T_A_this= T_T_A + "this.";
-	static final String T_A_this= T_A + "this.";
-	static final String T_B_this= T_B + "this.";
-	static final String T_C_this= T_C + "this.";
-	static final String T_E_this= T_E + "this.";
-
-	static final String I_A= "i_a.";
-	static final String I_AA= "i_aa.";
-	static final String I_AB= "i_ab.";
-	static final String I_AC= "i_ac.";
-	static final String I_AD= "i_ad.";
-	static final String I_AE= "i_ae.";
-	static final String I_AF= "i_af.";
-	static final String I_B= "i_b.";
-	static final String I_BB= "i_bb.";
-	static final String I_BC= "i_bc.";
-	static final String I_BD= "i_bd.";
-	static final String I_C= "i_c.";
-	static final String I_CB= "i_cb.";
-	static final String I_CC= "i_cc.";
-	static final String I_CD= "i_cd.";
-	static final String I_D= "i_d.";
-	static final String I_DB= "i_db.";
-	static final String I_DC= "i_dc.";
-	static final String I_DD= "i_dd.";
-	static final String I_E= "i_e.";
-	static final String I_EB= "i_eb.";
-	static final String I_EC= "i_ec.";
-	static final String I_ED= "i_ed.";
-	static final String I_F= "i_f.";
-	static final String I_FB= "i_fb.";
-	static final String I_FC= "i_fc.";
-	static final String I_FD= "i_fd.";
-	
-
-	/**
-	 * Constructor for Tests.
-	 * @param name
-	 */
-	public Tests(String name) {
-		super(name);
-	}
-
-	static protected IJavaThread fSuspendeeThread;
-	
-	static protected IJavaStackFrame fFrame;
-	
-	static protected ICompilationUnit fCu;
-	
-	static protected IEvaluationEngine fEngine;
-	
-
-	static protected IValue eval(String command) {
-		
-		class Listener implements IEvaluationListener {
-			IEvaluationResult fResult;
-			
-			public void evaluationComplete(IEvaluationResult result) {
-				fResult= result;
-			}
-			
-			public IEvaluationResult getResult() {
-				return fResult;
-			}
-			
-			public boolean evaluationTimedOut(IJavaThread thread) {
-				return true;
-			}
-		};
-		Listener listener= new Listener();
-		try {
-			fEngine.evaluate(command, fFrame, listener, DebugEvent.EVALUATION_IMPLICIT, false);
-		} catch (DebugException e) {
-			e.printStackTrace();
-		}
-		while (listener.fResult == null) {
-			try {
-				Thread.sleep(100);
-			} catch(InterruptedException e) {
-			}
-		}
-		IEvaluationResult result= listener.getResult();
-		if (result.hasErrors()) {
-			String message;
-			DebugException exception= result.getException();
-			if (exception == null) {
-				message= "";
-				Message[] messages= result.getErrors();
-				for (int i= 0, limit= messages.length; i < limit; i++) {
-					message += messages[i].getMessage() + ", ";
-				}
-			} else {
-				message= exception.getStatus().getMessage();
-			}
-			assertTrue(message, false);
-		}
-		return result.getValue();
-	}
-	
-	protected void initializeFrame(String testClass, int breakPointLine, int numberFrames) throws Exception {
-		fFrame = getStackFrame(breakPointLine, numberFrames, 0, 0, testClass);
-
-		fEngine = getEvaluationEngine((IJavaDebugTarget)fFrame.getDebugTarget(), getJavaProject());
-	}
-	
-	protected void initializeFrame(String testClass, int breakPointLine, int numberFrames, int hitCount) throws Exception {
-		fFrame = getStackFrame(breakPointLine, numberFrames, 0, hitCount, testClass);
-
-		fEngine = getEvaluationEngine((IJavaDebugTarget)fFrame.getDebugTarget(), getJavaProject());
-	}
-	
-	protected void destroyFrame() throws Exception {
-		try {
-			terminateAndRemove(fSuspendeeThread);
-		} finally {
-			removeAllBreakpoints();
-			if (fEngine != null) {
-				fEngine.dispose();
-			}
-		}
-		fFrame = null;
-	}
-	
-	
-	protected IEvaluationEngine getEvaluationEngine(IJavaDebugTarget vm, IJavaProject project) {
-		IEvaluationEngine engine = EvaluationManager.newAstEvaluationEngine(project, vm);
-		return engine;
-	}		
-	
-	protected IJavaStackFrame getStackFrame(int breakpointLine, int numberFrames, int frameNumber, int hitCount, String testClass) throws Exception {
-		IJavaLineBreakpoint breakpoint= createLineBreakpoint(breakpointLine, testClass);
-		breakpoint.setHitCount(hitCount);
-		fSuspendeeThread= launchToLineBreakpoint(testClass, breakpoint);
-		IStackFrame[] stackFrames= fSuspendeeThread.getStackFrames();
-		assertEquals("Should be " + numberFrames + " stack frame children, was: " + stackFrames.length, numberFrames, stackFrames.length);
-		IStackFrame stackFrame= stackFrames[frameNumber];
-		return (IJavaStackFrame)stackFrame;
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
deleted file mode 100644
index ae698a7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
+++ /dev/null
@@ -1,424 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsArrays extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsArrays(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalArrayTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testIntArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[0], intValue);
-
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[1], intValue);
-
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[2], intValue);
-
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[0], intValue);
-
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[1], intValue);
-
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[2], intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", xArrayIntValue.length, intValue);
-
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", yArrayIntValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]" + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xArrayInt + "[1]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(xArrayInt + "[2]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[0]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + "[1]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[2]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 2, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + ", " + xInt + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 3, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[0], stringValue);
-
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[1], stringValue);
-
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[2], stringValue);
-
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[0], stringValue);
-
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[1], stringValue);
-
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[2], stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", xArrayStringValue.length, intValue);
-
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", yArrayStringValue.length, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]" + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xArrayString + "[1]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(xArrayString + "[2]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[0]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + "[1]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[2]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		int intValue = 0;
-		java.lang.String stringValue = yStringValue;
-		value = eval(xArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 2, intValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + ", " + xString + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 3, intValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java
deleted file mode 100644
index 720612d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsNestedTypes extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNestedTypes(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 252, 4, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
deleted file mode 100644
index d117a6e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
+++ /dev/null
@@ -1,560 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsNestedTypes1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNestedTypes1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 252, 4, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
deleted file mode 100644
index fc96d73..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
+++ /dev/null
@@ -1,434 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsNestedTypes2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNestedTypes2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 739, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(I_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_h : wrong result : ", hStringValue_1, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AA + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_c : wrong result : ", cStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_i : wrong result : ", iStringValue_2, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
deleted file mode 100644
index 6b9deb1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
+++ /dev/null
@@ -1,813 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TestsNumberLiteral extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNumberLiteral(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 15, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void test0() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0 : wrong result : ", 0, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test00() throws Throwable {
-		try {
-		init();
-		IValue value = eval("00");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("00 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("00 : wrong result : ", 00, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x0() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x0");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x0 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x0 : wrong result : ", 0x0, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testN1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-1");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("-1 : wrong result : ", -1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test2147483647() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2147483647");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2147483647 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("2147483647 : wrong result : ", 2147483647, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testN2147483648() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-2147483648");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-2147483648 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("-2147483648 : wrong result : ", -2147483648, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x7fffffff() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x7fffffff");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x7fffffff : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x7fffffff : wrong result : ", 0x7fffffff, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x80000000() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x80000000");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x80000000 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x80000000 : wrong result : ", 0x80000000, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0xffffffff() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xffffffff");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xffffffff : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0xffffffff : wrong result : ", 0xffffffff, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test017777777777() throws Throwable {
-		try {
-		init();
-		IValue value = eval("017777777777");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("017777777777 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("017777777777 : wrong result : ", 017777777777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test020000000000() throws Throwable {
-		try {
-		init();
-		IValue value = eval("020000000000");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("020000000000 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("020000000000 : wrong result : ", 020000000000, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test037777777777() throws Throwable {
-		try {
-		init();
-		IValue value = eval("037777777777");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("037777777777 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("037777777777 : wrong result : ", 037777777777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0372() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0372");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0372 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0372 : wrong result : ", 0372, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0xDadaCafe() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xDadaCafe");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xDadaCafe : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0xDadaCafe : wrong result : ", 0xDadaCafe, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1996() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1996");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1996 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("1996 : wrong result : ", 1996, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x00FF00FF() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x00FF00FF");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x00FF00FF : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x00FF00FF : wrong result : ", 0x00FF00FF, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0L : wrong result : ", 0L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test00L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("00L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("00L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("00L : wrong result : ", 00L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x0L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x0L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x0L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x0L : wrong result : ", 0x0L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testN1L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-1L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-1L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("-1L : wrong result : ", -1L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("1L : wrong result : ", 1L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test9223372036854775807L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("9223372036854775807L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("9223372036854775807L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("9223372036854775807L : wrong result : ", 9223372036854775807L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testN9223372036854775808L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-9223372036854775808L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-9223372036854775808L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("-9223372036854775808L : wrong result : ", -9223372036854775808L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x7fffffffffffffffL() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x7fffffffffffffffL");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x7fffffffffffffffL : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x7fffffffffffffffL : wrong result : ", 0x7fffffffffffffffL, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x8000000000000000L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x8000000000000000L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x8000000000000000L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x8000000000000000L : wrong result : ", 0x8000000000000000L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0xffffffffffffffffL() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xffffffffffffffffL");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xffffffffffffffffL : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0xffffffffffffffffL : wrong result : ", 0xffffffffffffffffL, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0777777777777777777777L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0777777777777777777777L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0777777777777777777777L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0777777777777777777777L : wrong result : ", 0777777777777777777777L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test01000000000000000000000L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("01000000000000000000000L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("01000000000000000000000L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("01000000000000000000000L : wrong result : ", 01000000000000000000000L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test01777777777777777777777L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("01777777777777777777777L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("01777777777777777777777L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("01777777777777777777777L : wrong result : ", 01777777777777777777777L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0777l() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0777l");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0777l : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0777l : wrong result : ", 0777l, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0x100000000L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x100000000L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x100000000L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x100000000L : wrong result : ", 0x100000000L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test2147483648L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2147483648L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2147483648L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("2147483648L : wrong result : ", 2147483648L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0xC0B0L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xC0B0L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xC0B0L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0xC0B0L : wrong result : ", 0xC0B0L, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test3_40282347eP38f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("3.40282347e+38f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("3.40282347e+38f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("3.40282347e+38f : wrong result : ", 3.40282347e+38f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1_40239846eN45f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1.40239846e-45f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1.40239846e-45f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("1.40239846e-45f : wrong result : ", 1.40239846e-45f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1e1f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e1f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e1f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("1e1f : wrong result : ", 1e1f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test2_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2.f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2.f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("2.f : wrong result : ", 2.f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test_3f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(".3f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals(".3f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals(".3f : wrong result : ", .3f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("0f : wrong result : ", 0f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test3_14f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("3.14f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("3.14f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("3.14f : wrong result : ", 3.14f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test6_022137eP23f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("6.022137e+23f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("6.022137e+23f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("6.022137e+23f : wrong result : ", 6.022137e+23f, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1_79769313486231570eP308() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1.79769313486231570e+308");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1.79769313486231570e+308 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1.79769313486231570e+308 : wrong result : ", 1.79769313486231570e+308, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test4_94065645841246544eN324() throws Throwable {
-		try {
-		init();
-		IValue value = eval("4.94065645841246544e-324");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("4.94065645841246544e-324 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("4.94065645841246544e-324 : wrong result : ", 4.94065645841246544e-324, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1e1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e1");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e1 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1e1 : wrong result : ", 1e1, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test2_() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2.");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2. : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("2. : wrong result : ", 2., doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test_3() throws Throwable {
-		try {
-		init();
-		IValue value = eval(".3");
-		String typeName = value.getReferenceTypeName();
-		assertEquals(".3 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals(".3 : wrong result : ", .3, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test0_0() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0.0");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0.0 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("0.0 : wrong result : ", 0.0, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test3_14() throws Throwable {
-		try {
-		init();
-		IValue value = eval("3.14");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("3.14 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("3.14 : wrong result : ", 3.14, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1eN9d() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e-9d");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e-9d : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1e-9d : wrong result : ", 1e-9d, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void test1e137() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e137");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e137 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1e137 : wrong result : ", 1e137, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
deleted file mode 100644
index f659213..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsOperators1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsOperators1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testIntPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", xIntValue + yIntValue, intValue);
-
-		value = eval(yInt + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", yIntValue + xIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", xStringValue + yStringValue, stringValue);
-
-		value = eval(yString + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", yStringValue + xStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xVarIntValue, intValue);
-
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yVarIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xVarStringValue, stringValue);
-
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yVarStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
deleted file mode 100644
index 62e24cb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsOperators2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsOperators2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarInt + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentString() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xStringValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yStringValue;
-		value = eval(xVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xStringValue;
-		value = eval(yVarString + plusAssignmentOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yStringValue;
-		value = eval(yVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
deleted file mode 100644
index abd168f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TestsTypeHierarchy1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsTypeHierarchy1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 146, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_iaa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iaa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iaa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iaa.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
deleted file mode 100644
index 84bcab7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TestsTypeHierarchy2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsTypeHierarchy2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 119, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java
deleted file mode 100644
index 9375fb4..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_108_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_108_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 119, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java
deleted file mode 100644
index e421ce0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_119_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_119_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 119, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java
deleted file mode 100644
index 40c29f7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java
+++ /dev/null
@@ -1,904 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_135_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_135_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 146, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_iaa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iaa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iaa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iaa.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_iab_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iab.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iab.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iab.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_iac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iac.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java
deleted file mode 100644
index 5fa3541..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java
+++ /dev/null
@@ -1,904 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_146_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_146_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 146, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_iaa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iaa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iaa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iaa.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_iab_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iab.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iab.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iab.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_iac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iac.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s2 : wrong result : ", 999, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s4 : wrong result : ", 888, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m5 : wrong result : ", 555, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m6 : wrong result : ", 666, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s6 : wrong result : ", 777, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java
deleted file mode 100644
index 457a9ca..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java
deleted file mode 100644
index a45fe93..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java
deleted file mode 100644
index 351ba71..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_3(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java
deleted file mode 100644
index 12e804c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_4 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_4(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java
deleted file mode 100644
index ad9a98d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_5 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_5(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 5);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java
deleted file mode 100644
index e0c2770..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_6 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_6(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 6);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java
deleted file mode 100644
index 9ddd6a6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java
deleted file mode 100644
index 0586f30..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java
deleted file mode 100644
index 6c524ba..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_3(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java
deleted file mode 100644
index ec0003f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_4 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_4(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java
deleted file mode 100644
index 9e99064..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_5 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_5(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 5);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java
deleted file mode 100644
index bf6fa3a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_6 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_6(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 6);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java
deleted file mode 100644
index 00708ef..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_57_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_57_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java
deleted file mode 100644
index 55c2db5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_57_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_57_2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java
deleted file mode 100644
index 76ddaf0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_57_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_57_3(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java
deleted file mode 100644
index 0e31a48..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_68_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_68_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 33, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 44, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java
deleted file mode 100644
index e0cb8b9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_68_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_68_2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java
deleted file mode 100644
index 853ad44..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_68_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_68_3(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 1, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 2, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java
deleted file mode 100644
index 9d875c5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIArrayValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class VariableDeclarationTests extends Tests {
-
-	public VariableDeclarationTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// int
-	public void testInt() throws Throwable {
-		try {
-			init();
-			IValue value = eval("int i= 3; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 3, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.lang.String
-	public void testString() throws Throwable {
-		try {
-			init();
-			IValue value = eval("String i= \"test\"; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.lang.String : wrong type : ", "java.lang.String", typeName);
-			String stringValue = ((JDIObjectValue)value).getValueString();
-			assertEquals("java.lang.String : wrong result : ", "test", stringValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.util.ArrayList
-	public void testArrayList() throws Throwable {
-		try {
-			init();
-			IValue value = eval("java.util.ArrayList i= new java.util.ArrayList(); return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.util.ArrayList : wrong type : ", "java.util.ArrayList", typeName);
-		} finally {
-			end();
-		}
-	}
-
-	// int[]
-	public void testIntTab() throws Throwable {
-		try {
-			init();
-			IValue value = eval("int[] i= new int[] {3,2}; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int[] : wrong type : ", "int[]", typeName);
-			IValue cellValue = ((JDIArrayValue)value).getValue(0);
-			typeName = cellValue.getReferenceTypeName();
-			assertEquals("int[] : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)cellValue).getIntValue();
-			assertEquals("int[] : wrong result : ", 3, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.lang.String[]
-	public void testStringTab() throws Throwable {
-		try {
-			init();
-			IValue value = eval("String[] i= new String[] {\"test1\",\"test2\"}; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.lang.String[] : wrong type : ", "java.lang.String[]", typeName);
-			IValue cellValue = ((JDIArrayValue)value).getValue(0);
-			typeName = cellValue.getReferenceTypeName();
-			assertEquals("java.lang.String[] : wrong type : ", "java.lang.String", typeName);
-			String stringValue = ((JDIObjectValue)cellValue).getValueString();
-			assertEquals("java.lang.String[] : wrong result : ", "test1", stringValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.util.ArrayList[]
-	public void testArrayListTab() throws Throwable {
-		try {
-			init();
-			IValue value = eval("java.util.ArrayList[] i= new java.util.ArrayList[] {new java.util.ArrayList(), new java.util.ArrayList()}; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.util.ArrayList[] : wrong type : ", "java.util.ArrayList[]", typeName);
-			IValue cellValue = ((JDIArrayValue)value).getValue(0);
-			typeName = cellValue.getReferenceTypeName();
-			assertEquals("java.util.ArrayList[] : wrong type : ", "java.util.ArrayList", typeName);
-		} finally {
-			end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
deleted file mode 100644
index 15e1dc5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
+++ /dev/null
@@ -1,977 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class XfixOperatorsTests extends Tests {
-
-	public XfixOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// {++, --} byte
-	// byte {++, --}
-
-	public void testPrefixPlusPlusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(prefixPlusPlusOp + xVarByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixPlusPlus byte : wrong result : ", ++tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(prefixPlusPlusOp + yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixPlusPlus byte : wrong result : ", ++tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(prefixMinusMinusOp + xVarByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixMinusMinus byte : wrong result : ", --tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(prefixMinusMinusOp + yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixMinusMinus byte : wrong result : ", --tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(xVarByte + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixPlusPlus : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixPlusPlus : wrong result : ", tmpxVar++, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(yVarByte + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixPlusPlus : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixPlusPlus : wrong result : ", tmpyVar++, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(xVarByte + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixMinusMinus : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixMinusMinus : wrong result : ", tmpxVar--, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(yVarByte + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixMinusMinus : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixMinusMinus : wrong result : ", tmpyVar--, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// {++, --} char
-	// char {++, --}
-
-	public void testPrefixPlusPlusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(prefixPlusPlusOp + xVarChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixPlusPlus char : wrong result : ", ++tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(prefixPlusPlusOp + yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixPlusPlus char : wrong result : ", ++tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(prefixMinusMinusOp + xVarChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixMinusMinus char : wrong result : ", --tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(prefixMinusMinusOp + yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixMinusMinus char : wrong result : ", --tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(xVarChar + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char postfixPlusPlus : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixPlusPlus : wrong result : ", tmpxVar++, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(yVarChar + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char postfixPlusPlus : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixPlusPlus : wrong result : ", tmpyVar++, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(xVarChar + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char postfixMinusMinus : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixMinusMinus : wrong result : ", tmpxVar--, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(yVarChar + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char postfixMinusMinus : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixMinusMinus : wrong result : ", tmpyVar--, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// {++, --} short
-	// short {++, --}
-
-	public void testPrefixPlusPlusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(prefixPlusPlusOp + xVarShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixPlusPlus short : wrong result : ", ++tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(prefixPlusPlusOp + yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixPlusPlus short : wrong result : ", ++tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(prefixMinusMinusOp + xVarShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixMinusMinus short : wrong result : ", --tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(prefixMinusMinusOp + yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixMinusMinus short : wrong result : ", --tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(xVarShort + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short postfixPlusPlus : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixPlusPlus : wrong result : ", tmpxVar++, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(yVarShort + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short postfixPlusPlus : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixPlusPlus : wrong result : ", tmpyVar++, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(xVarShort + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short postfixMinusMinus : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixMinusMinus : wrong result : ", tmpxVar--, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(yVarShort + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short postfixMinusMinus : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixMinusMinus : wrong result : ", tmpyVar--, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// {++, --} int
-	// int {++, --}
-
-	public void testPrefixPlusPlusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(prefixPlusPlusOp + xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixPlusPlus int : wrong result : ", ++tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(prefixPlusPlusOp + yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixPlusPlus int : wrong result : ", ++tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(prefixMinusMinusOp + xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixMinusMinus int : wrong result : ", --tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(prefixMinusMinusOp + yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixMinusMinus int : wrong result : ", --tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(xVarInt + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int postfixPlusPlus : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixPlusPlus : wrong result : ", tmpxVar++, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(yVarInt + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int postfixPlusPlus : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixPlusPlus : wrong result : ", tmpyVar++, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(xVarInt + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int postfixMinusMinus : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixMinusMinus : wrong result : ", tmpxVar--, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(yVarInt + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int postfixMinusMinus : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixMinusMinus : wrong result : ", tmpyVar--, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// {++, --} long
-	// long {++, --}
-
-	public void testPrefixPlusPlusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(prefixPlusPlusOp + xVarLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixPlusPlus long : wrong result : ", ++tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(prefixPlusPlusOp + yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixPlusPlus long : wrong result : ", ++tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(prefixMinusMinusOp + xVarLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixMinusMinus long : wrong result : ", --tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(prefixMinusMinusOp + yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixMinusMinus long : wrong result : ", --tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(xVarLong + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long postfixPlusPlus : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixPlusPlus : wrong result : ", tmpxVar++, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(yVarLong + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long postfixPlusPlus : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixPlusPlus : wrong result : ", tmpyVar++, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(xVarLong + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long postfixMinusMinus : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixMinusMinus : wrong result : ", tmpxVar--, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(yVarLong + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long postfixMinusMinus : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixMinusMinus : wrong result : ", tmpyVar--, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// {++, --} float
-	// float {++, --}
-
-	public void testPrefixPlusPlusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(prefixPlusPlusOp + xVarFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixPlusPlus float : wrong result : ", ++tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(prefixPlusPlusOp + yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixPlusPlus float : wrong result : ", ++tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(prefixMinusMinusOp + xVarFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixMinusMinus float : wrong result : ", --tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(prefixMinusMinusOp + yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixMinusMinus float : wrong result : ", --tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(xVarFloat + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float postfixPlusPlus : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixPlusPlus : wrong result : ", tmpxVar++, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(yVarFloat + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float postfixPlusPlus : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixPlusPlus : wrong result : ", tmpyVar++, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(xVarFloat + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float postfixMinusMinus : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixMinusMinus : wrong result : ", tmpxVar--, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(yVarFloat + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float postfixMinusMinus : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixMinusMinus : wrong result : ", tmpyVar--, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	// {++, --} double
-	// double {++, --}
-
-	public void testPrefixPlusPlusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(prefixPlusPlusOp + xVarDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixPlusPlus double : wrong result : ", ++tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(prefixPlusPlusOp + yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixPlusPlus double : wrong result : ", ++tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(prefixMinusMinusOp + xVarDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixMinusMinus double : wrong result : ", --tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(prefixMinusMinusOp + yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixMinusMinus double : wrong result : ", --tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(xVarDouble + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double postfixPlusPlus : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixPlusPlus : wrong result : ", tmpxVar++, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(yVarDouble + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double postfixPlusPlus : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixPlusPlus : wrong result : ", tmpyVar++, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(xVarDouble + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double postfixMinusMinus : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixMinusMinus : wrong result : ", tmpxVar--, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(yVarDouble + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double postfixMinusMinus : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixMinusMinus : wrong result : ", tmpyVar--, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
deleted file mode 100644
index 4c9793f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
+++ /dev/null
@@ -1,800 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class NestedTypeTestGenerator extends TestGenerator {
-
-	static final int T_T = 0;
-	static final int T_T_A= 1;
-	static final int T_A= 2;
-	static final int T_T_A_AA= 3;
-	static final int T_A_AA= 4;
-	static final int T_AA= 5;
-	static final int T_T_A_AB= 44;
-	static final int T_A_AB= 45;
-	static final int T_AB= 46;
-	static final int T_T_B= 39;
-	static final int T_B= 40;
-	static final int T_T_B_BB= 41;
-	static final int T_B_BB= 42;
-	static final int T_BB= 43;
-	static final int T_C= -1;
-	static final int T_E= -1;
-
-	static final int T_T_this= 6;
-	static final int T_T_A_this= 7;
-	static final int T_A_this= 8;
-	static final int T_B_this= 9;
-	static final int T_C_this= 10;
-	static final int T_E_this= 11;
-
-	static final int I_A= 12;
-	static final int I_AA= 13;
-	static final int I_AB= 14;
-	static final int I_AC= 15;
-	static final int I_AD= 16;
-	static final int I_AE= 17;
-	static final int I_AF= 18;
-	static final int I_B= 19;
-	static final int I_BB= 20;
-	static final int I_BC= 21;
-	static final int I_BD= 22;
-	static final int I_C= 23;
-	static final int I_CB= 24;
-	static final int I_CC= 25;
-	static final int I_CD= 26;
-	static final int I_D= 27;
-	static final int I_DB= 28;
-	static final int I_DC= 29;
-	static final int I_DD= 30;
-	static final int I_E= 31;
-	static final int I_EB= 32;
-	static final int I_EC= 33;
-	static final int I_ED= 34;
-	static final int I_F= 35;
-	static final int I_FB= 36;
-	static final int I_FC= 37;
-	static final int I_FD= 38;
-
-	static final String[] qualifiers= 
-		{"T_T",     "T_T_A",    "T_A",    "T_T_A_AA", "T_A_AA",   "T_AA",   "T_T_this", "T_T_Athis", "T_A_this", "T_B_this",
-		"T_C_this", "T_E_this", "I_A",    "I_AA",     "I_AB",     "I_AC",   "I_AD",     "I_AE",      "I_AF",     "I_B",
-		"I_BB",     "I_BC",     "I_BD",   "I_C",      "I_CB",     "I_CC",   "I_CD",     "I_D",       "I_DB",     "I_DC",
-		"I_DD",     "I_E",      "I_EB",   "I_EC",     "I_ED",     "I_F",    "I_FB",     "I_FC",      "I_FD",     "T_T_B",
-		"T_B",      "T_T_B_BB", "T_B_BB", "T_BB",     "T_T_A_AB", "T_A_AB", "T_AB"};
-	
-	static final int [] qualifiersLevel=
-		{0, 1, 1, 2, 2, 2, 0, 1, 1, 1,
-		 1, 1, 1, 2, 2, 2, 2, 2, 2, 1,
-		 2, 2, 2, 1, 2, 2, 2, 1, 2, 2,
-		 2, 1, 2, 2, 2, 1, 2, 2, 2, 1,
-		 1, 2, 2, 2, 2, 2, 2};
-
-	public static void main(String[] args) throws Exception {
-		gen_AA_aa();
-		gen_AA_aaStatic();
-		gen_AB_ab();
-		gen_AC_ac();
-		gen_AD_ad();
-		gen_A_a();
-		gen_AE_ae();
-		gen_AF_af();
-		gen_A_aStatic();
-		gen_BB_bb();
-		gen_BC_bc();
-		gen_BD_bd();
-		gen_B_b();
-		gen_CB_cb();
-		gen_CC_cc();
-		gen_CD_cd();
-		gen_C_c();
-		gen_DB_db();
-		gen_DC_dc();
-		gen_DD_dd();
-		gen_D_d();
-		gen_EB_eb();
-		gen_EC_ec();
-		gen_ED_ed();
-		gen_E_e();
-		gen_FB_fb();
-		gen_FC_fc();
-		gen_FD_fd();
-		gen_F_f();
-		gen_evalNestedTypeTest();
-		gen_evalNestedTypeTestStatic();
-		System.out.println("done");
-	}
-	
-	public static void gen_AA_aa() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('c', 2, code);
-		createTest('d', 2, code);
-		createTest('e', 2, code);
-		createTest('f', 2, code);
-		createTest('h', 2, code);
-		createTest('i', 2, code);
-		createTest('j', 2, code);
-		createTestThis('c', 2, code);
-		createTestThis('d', 2, code);
-		createTestThis('e', 2, code);
-		createTestThis('f', 2, code);
-		createTestThis('i', 2, code);
-		createTestThis('j', 2, code);
-		createTestsStaticFields_A(code);
-		
-		createJavaFile(code, 54, 4);
-	}
-	
-	public static void gen_AA_aaStatic() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('d', 2, code);
-		createTest('f', 2, code);
-		createTest('h', 2, code);
-		createTest('j', 2, code);
-		createTestsStaticFields_A(code);
-
-		createJavaFile(code, 58, 4);
-	}
-	
-	public static void gen_AB_ab() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('c', 2, code);
-		createTest('d', 2, code);
-		createTest('e', 2, code);
-		createTest('f', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTest('i', 2, code);
-		createTest('j', 2, code);
-		createTestThis('c', 2, code);
-		createTestThis('d', 2, code);
-		createTestThis('e', 2, code);
-		createTestThis('f', 2, code);
-		createTestThis('i', 2, code);
-		createTestThis('j', 2, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(T_A_this, 'c', code);
-		createTestQualifier(T_A_this, 'd', code);
-		createTestQualifier(T_A_this, 'g', code);
-		createTestQualifier(T_A_this, 'h', code);
-		
-		createJavaFile(code, 83, 4);
-	}
-
-	public static void gen_AC_ac() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(T_A_this, 'c', code);
-		createTestQualifier(T_A_this, 'd', code);
-		createTestQualifier(T_A_this, 'g', code);
-		createTestQualifier(T_A_this, 'h', code);
-		
-		createJavaFile(code, 109, 4);
-	}
-	
-	public static void gen_AD_ad() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(T_A_this, 'c', code);
-		createTestQualifier(T_A_this, 'd', code);
-		createTestQualifier(T_A_this, 'g', code);
-		createTestQualifier(T_A_this, 'h', code);
-		
-		createJavaFile(code, 134, 4);
-	}
-	
-	public static void gen_A_a() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('c', 1, code);
-		createTest('d', 1, code);
-		createTest('f', 1, code);
-		createTest('g', 1, code);
-		createTest('h', 1, code);
-		createTestThis('c', 1, code);
-		createTestThis('d', 1, code);
-		createTestThis('g', 1, code);
-		createTestThis('h', 1, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(I_AB, 'c', code);
-		createTestQualifier(I_AB, 'd', code);
-		createTestQualifier(I_AB, 'e', code);
-		createTestQualifier(I_AB, 'f', code);
-		createTestQualifier(I_AB, 'i', code);
-		createTestQualifier(I_AB, 'j', code);
-		
-		createJavaFile(code, 144, 3);
-	}
-	
-	public static void gen_AE_ae() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		
-		createJavaFile(code, 168, 4);
-	}
-	
-	public static void gen_AF_af() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		
-		createJavaFile(code, 192, 4);
-	}
-	
-	public static void gen_A_aStatic() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('d', 1, code);
-		createTest('f', 1, code);
-		createTest('h', 1, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(I_AA, 'c', code);
-		createTestQualifier(I_AA, 'd', code);
-		createTestQualifier(I_AA, 'e', code);
-		createTestQualifier(I_AA, 'f', code);
-		createTestQualifier(I_AA, 'i', code);
-		createTestQualifier(I_AA, 'j', code);
-		
-		createJavaFile(code, 203, 3);
-	}
-	
-	public static void gen_BB_bb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTest('c', 2, code);
-		createTest('d', 2, code);
-		createTest('e', 2, code);
-		createTest('f', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTest('i', 2, code);
-		createTest('j', 2, code);
-		createTestThis('c', 2, code);
-		createTestThis('d', 2, code);
-		createTestThis('e', 2, code);
-		createTestThis('f', 2, code);
-		createTestThis('i', 2, code);
-		createTestThis('j', 2, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_B_this, 'c', code);
-		createTestQualifier(T_B_this, 'd', code);
-		createTestQualifier(T_B_this, 'g', code);
-		createTestQualifier(T_B_this, 'h', code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 241, 4);
-	}
-
-	public static void gen_BC_bc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_B_this, 'c', code);
-		createTestQualifier(T_B_this, 'd', code);
-		createTestQualifier(T_B_this, 'g', code);
-		createTestQualifier(T_B_this, 'h', code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 268, 4);
-	}
-
-	public static void gen_BD_bd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_B_this, 'c', code);
-		createTestQualifier(T_B_this, 'd', code);
-		createTestQualifier(T_B_this, 'g', code);
-		createTestQualifier(T_B_this, 'h', code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 293, 4);
-	}
-
-	public static void gen_B_b() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 1, code);
-		createTest('b', 1, code);
-		createTest('c', 1, code);
-		createTest('d', 1, code);
-		createTest('e', 1, code);
-		createTest('f', 1, code);
-		createTest('g', 1, code);
-		createTest('h', 1, code);
-		createTestThis('c', 1, code);
-		createTestThis('d', 1, code);
-		createTestThis('g', 1, code);
-		createTestThis('h', 1, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		createTestQualifier(I_BB, 'c', code);
-		createTestQualifier(I_BB, 'd', code);
-		createTestQualifier(I_BB, 'e', code);
-		createTestQualifier(I_BB, 'f', code);
-		createTestQualifier(I_BB, 'i', code);
-		createTestQualifier(I_BB, 'j', code);
-		
-		createJavaFile(code, 304, 3);
-	}
-
-	public static void gen_CB_cb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 343, 4);
-	}
-
-	public static void gen_CC_cc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 370, 4);
-	}
-
-	public static void gen_CD_cd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 395, 4);
-	}
-
-	public static void gen_C_c() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 1, code);
-		createTest('b', 1, code);
-		createTest('e', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 406, 3);
-	}
-
-	public static void gen_DB_db() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 444, 4);
-	}
-
-	public static void gen_DC_dc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 470, 4);
-	}
-
-	public static void gen_DD_dd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 495, 4);
-	}
-
-	public static void gen_D_d() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 1, code);
-		createTest('b', 1, code);
-		createTest('e', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 506, 3);
-	}
-	
-	public static void gen_evalNestedTypeTest() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		
-		createTest('a', 0, code);
-		createTest('b', 0, code);
-		createTest('c', 0, code);
-		createTest('d', 0, code);
-		createTest('e', 0, code);
-		createTest('f', 0, code);
-		createTestThis('a', 0, code);
-		createTestThis('b', 0, code);
-		createTestThis('c', 0, code);
-		createTestThis('d', 0, code);
-		createTestThis('e', 0, code);
-		createTestThis('f', 0, code);
-		createTestsStaticFields(code);
-		createTestQualifier(I_B, 'c', code);
-		createTestQualifier(I_B, 'd', code);
-		createTestQualifier(I_B, 'g', code);
-		createTestQualifier(I_B, 'h', code);
-		createTestQualifier(I_BB, 'c', code);
-		createTestQualifier(I_BB, 'd', code);
-		createTestQualifier(I_BB, 'e', code);
-		createTestQualifier(I_BB, 'f', code);
-		createTestQualifier(I_BB, 'i', code);
-		createTestQualifier(I_BB, 'j', code);
-		
-		createJavaFile(code, 518, 2);
-	}
-
-	public static void gen_EB_eb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 555, 4);
-	}
-
-	public static void gen_EC_ec() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 581, 4);
-	}
-
-	public static void gen_ED_ed() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 605, 4);
-	}
-
-	public static void gen_E_e() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 615, 3);
-	}
-	
-	public static void gen_FB_fb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 653, 4);
-	}
-
-	public static void gen_FC_fc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 679, 4);
-	}
-
-	public static void gen_FD_fd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 703, 4);
-	}
-
-	public static void gen_F_f() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 713, 3);
-	}
-	
-	public static void gen_evalNestedTypeTestStatic() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 0, code);
-		createTest('d', 0, code);
-		createTest('f', 0, code);
-		createTestsStaticFields(code);
-		createTestQualifier(I_A, 'c', code);
-		createTestQualifier(I_A, 'd', code);
-		createTestQualifier(I_A, 'g', code);
-		createTestQualifier(I_A, 'h', code);
-		createTestQualifier(I_AA, 'c', code);
-		createTestQualifier(I_AA, 'd', code);
-		createTestQualifier(I_AA, 'e', code);
-		createTestQualifier(I_AA, 'f', code);
-		createTestQualifier(I_AA, 'i', code);
-		createTestQualifier(I_AA, 'j', code);
-		createTestQualifier(I_AB, 'c', code);
-		createTestQualifier(I_AB, 'd', code);
-		createTestQualifier(I_AB, 'e', code);
-		createTestQualifier(I_AB, 'f', code);
-		createTestQualifier(I_AB, 'i', code);
-		createTestQualifier(I_AB, 'j', code);
-		
-		createJavaFile(code, 728, 2);
-	}
-	
-	public static void gen_main() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTestsStaticFields(code);
-
-		createJavaFile(code, 734, 1);
-	}
-
-	// ------------------------------
-	
-	public static void createTestsStaticFields(StringBuffer code) {
-		createTestQualifier(T_T, 'b', code);
-		createTestQualifier(T_T, 'd', code);
-		createTestQualifier(T_T, 'f', code);
-		createTestQualifier(T_T_A, 'd', code);
-		createTestQualifier(T_T_A, 'h', code);
-		createTestQualifier(T_A, 'd', code);
-		createTestQualifier(T_A, 'h', code);
-		createTestQualifier(T_T_A_AA, 'd', code);
-		createTestQualifier(T_T_A_AA, 'f', code);
-		createTestQualifier(T_T_A_AA, 'j', code);
-		createTestQualifier(T_T_A_AB, 'd', code);
-		createTestQualifier(T_T_A_AB, 'f', code);
-		createTestQualifier(T_T_A_AB, 'j', code);
-		createTestQualifier(T_A_AA, 'd', code);
-		createTestQualifier(T_A_AA, 'f', code);
-		createTestQualifier(T_A_AA, 'j', code);
-		createTestQualifier(T_A_AB, 'd', code);
-		createTestQualifier(T_A_AB, 'f', code);
-		createTestQualifier(T_A_AB, 'j', code);
-		createTestQualifier(T_T_B, 'd', code);
-		createTestQualifier(T_T_B, 'h', code);
-		createTestQualifier(T_B, 'd', code);
-		createTestQualifier(T_B, 'h', code);
-		createTestQualifier(T_T_B_BB, 'd', code);
-		createTestQualifier(T_T_B_BB, 'f', code);
-		createTestQualifier(T_T_B_BB, 'j', code);
-		createTestQualifier(T_B_BB, 'd', code);
-		createTestQualifier(T_B_BB, 'f', code);
-		createTestQualifier(T_B_BB, 'j', code);
-	}
-	
-	public static void createTestsStaticFields_A(StringBuffer code) {
-		createTestsStaticFields(code);
-		createTestQualifier(T_AA, 'd', code);
-		createTestQualifier(T_AA, 'f', code);
-		createTestQualifier(T_AA, 'j', code);
-		createTestQualifier(T_AB, 'd', code);
-		createTestQualifier(T_AB, 'f', code);
-		createTestQualifier(T_AB, 'j', code);
-	}
-	
-	public static void createTestsStaticFields_B(StringBuffer code) {
-		createTestsStaticFields(code);
-		createTestQualifier(T_BB, 'd', code);
-		createTestQualifier(T_BB, 'f', code);
-		createTestQualifier(T_BB, 'j', code);
-	}
-	
-	// ------------------------------
-	
-	public static void createTest(char variable, int level, StringBuffer code) {
-		code.append("\tpublic void testEvalNestedTypeTest_" + variable + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("" + variable + "Int", true, code);
-		genCodeReturnTypeCheck("" + variable, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType("" + variable, "int", "Int", variable + "IntValue_" + level, true, code);
-		code.append("\n");
-		
-		genCodeEval("" + variable + "String", false, code);
-		genCodeReturnTypeCheck("" + variable, "java.lang.String", false, code);
-		genCodeReturnValueCheckStringType("" + variable, variable + "StringValue_" + level, true, code);
-		
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void createTestThis(char variable, int level, StringBuffer code) {
-		code.append("\tpublic void testEvalNestedTypeTest_this_" + variable + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("THIS + " + variable + "Int", true, code);
-		genCodeReturnTypeCheck("" + variable, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType("" + variable, "int", "Int", variable + "IntValue_" + level, true, code);
-		code.append("\n");
-		
-		genCodeEval("THIS + " + variable + "String", false, code);
-		genCodeReturnTypeCheck("" + variable, "java.lang.String", false, code);
-		genCodeReturnValueCheckStringType("" + variable, variable + "StringValue_" + level, true, code);
-		
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	
-	
-	public static void createTestQualifier(int qualifier, char variable, StringBuffer code) {
-		String strQualifier= qualifiers[qualifier];
-		code.append("\tpublic void testEvalNestedTypeTest_" + strQualifier + "_" + variable + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval(strQualifier + " + " + variable + "Int", true, code);
-		genCodeReturnTypeCheck("" + strQualifier + "_" + variable, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType("" + strQualifier + "_" + variable, "int", "Int", variable + "IntValue_" + qualifiersLevel[qualifier], true, code);
-		code.append("\n");
-		
-		genCodeEval(strQualifier + " + " + variable + "String", false, code);
-		genCodeReturnTypeCheck("" + strQualifier + "_" + variable, "java.lang.String", false, code);
-		genCodeReturnValueCheckStringType("" + strQualifier + "_" + variable, variable + "StringValue_" + qualifiersLevel[qualifier], true, code);
-		
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	//---------------------
-	
-	public static void createJavaFile(StringBuffer tests, int lineNumber, int numberFrames) throws Exception {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n\n");
-		code.append("import org.eclipse.debug.core.model.IValue;\n");
-		code.append("import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n\n");
-		code.append("public class NestedTypeFieldValue_" + lineNumber + " extends Tests {\n");
-		code.append("\t/**\n");
-		code.append("\t * Constructor for NestedTypeFieldValue.\n");
-		code.append("\t * @param name\n");
-		code.append("\t */\n");
-		code.append("\tpublic NestedTypeFieldValue_" + lineNumber + "(String name) {\n");
-		code.append("\t\tsuper(name);\n");
-		code.append("\t}\n\n");
-		code.append("\tpublic void init() throws Exception {\n");
-		code.append("\t\tinitializeFrame(\"EvalNestedTypeTests\", " + lineNumber + ", " + numberFrames + ");\n");
-		code.append("\t}\n\n");
-		code.append("\tprotected void end() throws Exception {\n");
-		code.append("\t\tdestroyFrame();\n");
-		code.append("\t}\n\n");
-		
-		code.append(tests.toString());
-		
-		code.append("}\n");
-		
-		Writer file = new FileWriter(new File("NestedTypeFieldValue_" + lineNumber + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
deleted file mode 100644
index 1abf9dd..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class OtherTestsGenerator extends TestGenerator {
-
-	public static void main(String[] args) throws Exception {
-		
-		genTestsOperators1();
-		genTestsOperators2();
-		genTestsArray();
-		genTestsNestedTypes1();
-		genTestsNestedTypes2();
-		genTestsTypeHierarchy1();
-		genTestsTypeHierarchy2();
-		genTestNumberLiteral();
-		
-		genInstanceOfTests();
-
-		System.out.println("done");
-	}
-
-	public static void genTestsOperators1() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		genTestTypeBinaryOpTypeBinaryPromotion(T_int, Op_plus, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_String, code);
-		genTestLocalVarValue(T_int, code);
-		genTestLocalVarValue(T_String, code);
-		
-		createJavaFile(code, "TestsOperators1", "EvalSimpleTests", 37, 1, 1);
-	}
-
-	public static void genTestsOperators2() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		genTestLocalVarAssignment(T_int, code);
-		genTestLocalVarAssignment(T_String, code);
-		genTestTypeAssignmentOpType(T_int, Op_plusAss, T_int, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_String, code);
-		
-		createJavaFile(code, "TestsOperators2", "EvalSimpleTests", 37, 1, 1);
-	}
-	
-	public static void genTestsArray() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		genTestArrayValue(T_int, code);
-		genTestArrayLength(T_int, code);
-		genTestArrayAssignment(T_int, code);
-		genTestArrayInitialization(T_int, code);
-
-		genTestArrayValue(T_String, code);
-		genTestArrayLength(T_String, code);
-		genTestArrayAssignment(T_String, code);
-		genTestArrayInitialization(T_String, code);
-		
-		createJavaFile(code, "TestsArrays", "EvalArrayTests", 37, 1, 1);
-	}
-
-	public static void genTestsNestedTypes1() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		NestedTypeTestGenerator.createTest('a', 2, code);
-		NestedTypeTestGenerator.createTest('d', 2, code);
-		NestedTypeTestGenerator.createTest('e', 2, code);
-		NestedTypeTestGenerator.createTest('h', 2, code);
-		NestedTypeTestGenerator.createTest('i', 2, code);
-		NestedTypeTestGenerator.createTestThis('c', 2, code);
-		NestedTypeTestGenerator.createTestThis('f', 2, code);
-		NestedTypeTestGenerator.createTestThis('j', 2, code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T, 'b', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AA, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AA, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AB, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_BB, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_this, 'c', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_this, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_this, 'a', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_this, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_this, 'e', code);
-
-		createJavaFile(code, "TestsNestedTypes1", "EvalNestedTypeTests",  252, 4, 1);
-	}
-
-	public static void genTestsNestedTypes2() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		NestedTypeTestGenerator.createTest('f', 0, code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T, 'b', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AA, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AA, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AB, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_A, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AA, 'c', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AA, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AA, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AB, 'c', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AB, 'i', code);
-
-		createJavaFile(code, "TestsNestedTypes2", "EvalNestedTypeTests",  739, 2, 1);
-	}
-
-
-	public static void genTestsTypeHierarchy1() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.IAA, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.AA, TypeHierarchyTestsGenerator.M2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.AB, TypeHierarchyTestsGenerator.S2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.AC, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.IBB, TypeHierarchyTestsGenerator.M3, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.IBC, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BB, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BB, TypeHierarchyTestsGenerator.M3, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BC, TypeHierarchyTestsGenerator.S2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BC, TypeHierarchyTestsGenerator.S4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.ICC, TypeHierarchyTestsGenerator.M3, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.CC, TypeHierarchyTestsGenerator.M2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.CC, TypeHierarchyTestsGenerator.M4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.CC, TypeHierarchyTestsGenerator.M6, code);
-		
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_A, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_B, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_B, TypeHierarchyTestsGenerator.M2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_B, TypeHierarchyTestsGenerator.S4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_C, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_C, TypeHierarchyTestsGenerator.M4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_C, TypeHierarchyTestsGenerator.S6, code);
-
-		createJavaFile(code, "TestsTypeHierarchy1", "EvalTypeHierarchyTests",   146, 1, 1);
-	}
-
-	public static void genTestsTypeHierarchy2() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		TypeHierarchyTestsGenerator.createTest_TestC(code, TypeHierarchyTestsGenerator.CC);
-		
-		createJavaFile(code, "TestsTypeHierarchy2", "EvalTypeHierarchyTests",   119, 2, 1);
-	}
-
-	/**
-	 * Method genTestNumberLiteral.
-	 */
-	private static void genTestNumberLiteral() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTestNumberLiteral1("0", T_int, code);
-		createTestNumberLiteral1("00", T_int, code);
-		createTestNumberLiteral1("0x0", T_int, code);
-		createTestNumberLiteral1("-1", T_int, code);
-		createTestNumberLiteral1("1", T_int, code);
-		createTestNumberLiteral1("2147483647", T_int, code);
-		createTestNumberLiteral1("-2147483648", T_int, code);
-		createTestNumberLiteral1("0x7fffffff", T_int, code);
-		createTestNumberLiteral1("0x80000000", T_int, code);
-		createTestNumberLiteral1("0xffffffff", T_int, code);
-		createTestNumberLiteral1("017777777777", T_int, code);
-		createTestNumberLiteral1("020000000000", T_int, code);
-		createTestNumberLiteral1("037777777777", T_int, code);
-		createTestNumberLiteral1("2", T_int, code);
-		createTestNumberLiteral1("0372", T_int, code);
-		createTestNumberLiteral1("0xDadaCafe", T_int, code);
-		createTestNumberLiteral1("1996", T_int, code);
-		createTestNumberLiteral1("0x00FF00FF", T_int, code);
-		
-		createTestNumberLiteral1("0L", T_long, code);
-		createTestNumberLiteral1("00L", T_long, code);
-		createTestNumberLiteral1("0x0L", T_long, code);
-		createTestNumberLiteral1("-1L", T_long, code);
-		createTestNumberLiteral1("1L", T_long, code);
-		createTestNumberLiteral1("9223372036854775807L", T_long, code);
-		createTestNumberLiteral1("-9223372036854775808L", T_long, code);
-		createTestNumberLiteral1("0x7fffffffffffffffL", T_long, code);
-		createTestNumberLiteral1("0x8000000000000000L", T_long, code);
-		createTestNumberLiteral1("0xffffffffffffffffL", T_long, code);
-		createTestNumberLiteral1("0777777777777777777777L", T_long, code);
-		createTestNumberLiteral1("01000000000000000000000L", T_long, code);
-		createTestNumberLiteral1("01777777777777777777777L", T_long, code);
-		createTestNumberLiteral1("0777l", T_long, code);
-		createTestNumberLiteral1("0x100000000L", T_long, code);
-		createTestNumberLiteral1("2147483648L", T_long, code);
-		createTestNumberLiteral1("0xC0B0L", T_long, code);
-		
-		createTestNumberLiteral2("3.40282347e+38f", T_float, code);
-		createTestNumberLiteral2("1.40239846e-45f", T_float, code);
-		createTestNumberLiteral2("1e1f", T_float, code);
-		createTestNumberLiteral2("2.f", T_float, code);
-		createTestNumberLiteral2(".3f", T_float, code);
-		createTestNumberLiteral2("0f", T_float, code);
-		createTestNumberLiteral2("3.14f", T_float, code);
-		createTestNumberLiteral2("6.022137e+23f", T_float, code);
-
-		createTestNumberLiteral2("1.79769313486231570e+308", T_double, code);
-		createTestNumberLiteral2("4.94065645841246544e-324", T_double, code);
-		createTestNumberLiteral2("1e1", T_double, code);
-		createTestNumberLiteral2("2.", T_double, code);
-		createTestNumberLiteral2(".3", T_double, code);
-		createTestNumberLiteral2("0.0", T_double, code);
-		createTestNumberLiteral2("3.14", T_double, code);
-		createTestNumberLiteral2("1e-9d", T_double, code);
-		createTestNumberLiteral2("1e137", T_double, code);
-
-		createJavaFile(code, "TestsNumberLiteral", "EvalSimpleTests", 5, 1, 1);
-	}
-
-	/**
-	 * Method createTestNumberLiteral.
-	 */
-	private static void createTestNumberLiteral1(String literal, int type, StringBuffer code) {
-		String tName= typeName[type];
-		
-		code.append("\tpublic void test" + literal.replace('-', 'N').replace('.', '_').replace('+', 'P') + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeEval("\"" + literal + '"', true, code);
-		genCodeReturnTypeCheck(literal, tName, true, code);
-		genCodeReturnValueCheckPrimitiveType(literal, tName, typeUpperName[type], literal, true, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	/**
-	 * Method createTestNumberLiteral.
-	 */
-	private static void createTestNumberLiteral2(String literal, int type, StringBuffer code) {
-		String tName= typeName[type];
-		
-		code.append("\tpublic void test" + literal.replace('-', 'N').replace('.', '_').replace('+', 'P') + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeEval("\"" + literal + '"', true, code);
-		genCodeReturnTypeCheck(literal, tName, true, code);
-		genCodeReturnValueCheckFloatDoubleType(literal, tName, typeUpperName[type], literal, true, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genInstanceOfTests() throws Exception {
-	}
-
-
-	public static void createJavaFile(StringBuffer tests, String className, String testClass, int lineNumber, int numberFrames, int hitCount) throws Exception {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("/**********************************************************************\n");
-		code.append("Copyright (c) 2000, 2002 IBM Corp. and others.\n");
-		code.append("All rights reserved. This program and the accompanying materials\n");
-		code.append("are made available under the terms of the Common Public License v0.5\n");
-		code.append("which accompanies this distribution, and is available at\n");
-		code.append("http://www.eclipse.org/legal/cpl-v05.html\n\n");
-		code.append("Contributors:\n");
-		code.append("    IBM Corporation - Initial implementation\n");
-		code.append("*********************************************************************/\n");
-		code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n\n");
-		code.append("import org.eclipse.debug.core.model.IValue;\n");
-		code.append("import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n\n");
-		code.append("public class " + className + " extends Tests {\n");
-		code.append("\t/**\n");
-		code.append("\t * Constructor for TypeHierarchy.\n");
-		code.append("\t * @param name\n");
-		code.append("\t */\n");
-		code.append("\tpublic " + className + "(String name) {\n");
-		code.append("\t\tsuper(name);\n");
-		code.append("\t}\n\n");
-		code.append("\tpublic void init() throws Exception {\n");
-		code.append("\t\tinitializeFrame(\"" + testClass + "\", " + lineNumber + ", " + numberFrames + ", " + hitCount + ");\n");
-		code.append("\t}\n\n");
-		code.append("\tprotected void end() throws Exception {\n");
-		code.append("\t\tdestroyFrame();\n");
-		code.append("\t}\n\n");
-		
-		code.append(tests.toString());
-		
-		code.append("}\n");
-		
-		Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
deleted file mode 100644
index 6036f4b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
+++ /dev/null
@@ -1,1395 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class TestGenerator {
-	
-	static protected int getPromotionType(int left, int right) {
-		return fTypeTable[left][right];
-	}
-	
-	static protected int getUnaryPromotionType(int type) {
-		return fTypeTable[type][T_int];
-	}
-
-	static final int T_undefined = 0;
-	static final int T_object = 1;
-	static final int T_char = 2;
-	static final int T_byte = 3;
-	static final int T_short = 4;
-	static final int T_boolean = 5;
-	static final int T_void = 6;
-	static final int T_long = 7;
-	static final int T_double = 8;
-	static final int T_float = 9;
-	static final int T_int = 10;
-	static final int T_String = 11;
-	static final int T_null = 12;
-	
-	private static final int[][] fTypeTable= {
-/* undefined */	{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined},
-/* object */	{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_String, T_undefined},
-/* char */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* byte */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* short */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* boolean */	{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_boolean, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_String, T_undefined},
-/* void */		{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined},
-/* long */		{T_undefined, T_undefined, T_long, T_long, T_long, T_undefined, T_undefined, T_long, T_double, T_float, T_long, T_String, T_undefined},
-/* double */	{T_undefined, T_undefined, T_double, T_double, T_double, T_undefined, T_undefined, T_double, T_double, T_double, T_double, T_String, T_undefined},
-/* float */		{T_undefined, T_undefined, T_float, T_float, T_float, T_undefined, T_undefined, T_float, T_double, T_float, T_float, T_String, T_undefined},
-/* int */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* String */	{T_undefined, T_String, T_String, T_String, T_String, T_String, T_undefined, T_String, T_String, T_String, T_String, T_String, T_String},
-/* null */		{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_String, T_undefined},
-	};
-	
-	static final String[] typeName = new String[] {"undefined", "java.lang.Object", "char", "byte", "short", "boolean", "void", "long", "double", "float", "int", "java.lang.String", "null"};
-
-	static final String[] typeUpperName = new String[] {"Undefined", "Object", "Char", "Byte", "Short", "Boolean", "Void", "Long", "Double", "Float", "Int", "String", "Null"};
-	
-	static final int Op_plus = 0;
-	static final int Op_minus = 1;
-	static final int Op_multiply = 2;
-	static final int Op_divide = 3;
-	static final int Op_remainder = 4;
-	static final int Op_greater = 5;
-	static final int Op_greaterEqual = 6;
-	static final int Op_less = 7;
-	static final int Op_lessEqual = 8;
-	static final int Op_equalEqual = 9;
-	static final int Op_notEqual = 10;
-	static final int Op_leftShift = 11;
-	static final int Op_rightShift = 12;
-	static final int Op_unsignedRightShift = 13;
-	static final int Op_or = 14;
-	static final int Op_and = 15;
-	static final int Op_xor = 16;
-	static final int Op_twiddle = 17;
-	static final int Op_not = 18;
-	static final int Op_equal = 19;
-	static final int Op_plusAss = 20;
-	static final int Op_minusAss = 21;
-	static final int Op_multiplyAss = 22;
-	static final int Op_divideAss = 23;
-	static final int Op_remainderAss = 24;
-	static final int Op_leftShiftAss = 25;
-	static final int Op_rightShiftAss = 26;
-	static final int Op_unsignedRightShiftAss = 27;
-	static final int Op_orAss = 28;
-	static final int Op_andAss = 29;
-	static final int Op_xorAss = 30;
-	static final int Op_prefixPlusPlus = 31;
-	static final int Op_postfixPlusPlus = 32;
-	static final int Op_prefixMinusMinus = 33;
-	static final int Op_postfixMinusMinus = 34;
-	
-	static final String[] opSymbol = new String[] {"+", "-", "*", "/", "%", ">", ">=", "<", "<=", "==", "!=", "<<", ">>", ">>>", "|", "&", "^", "~", "!", "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=", "|=", "&=", "^=", "++", "++", "--", "--"};
-	
-	static final String[] opName = new String[] {"plus", "minus", "multiply", "divide", "remainder", "greater", "greaterEqual", "less", "lessEqual", "equalEqual", "notEqual", "leftShift", "rightShift", "unsignedRightShift", "or", "and", "xor", "twiddle", "not", "equal", "plusAssignment", "minusAssignment", "multiplyAssignment", "divideAssignment", "remainderAssignment", "leftShiftAssignment", "rightShiftAssignment", "unsignedRightShiftAssignment", "orAssignment", "andAssignment", "xorAssignment", "prefixPlusPlus", "postfixPlusPlus", "prefixMinusMinus", "postfixMinusMinus"};
-	
-	static final String[] opUpperName = new String[] {"Plus", "Minus", "Multiply", "Divide", "Remainder", "Greater", "GreaterEqual", "Less", "LessEqual", "EqualEqual", "NotEqual", "LeftShift", "RightShift", "UnsignedRightShift", "Or", "And", "Xor", "Twiddle", "Not", "Equal", "PlusAssignment", "MinusAssignment", "MultiplyAssignment", "DivideAssignment", "RemainderAssignment", "LeftShiftAssignment", "RightShiftAssignment", "UnsignedRightShiftAssignment", "OrAssignment", "AndAssignment", "XorAssignment", "PrefixPlusPlus", "PostfixPlusPlus", "PrefixMinusMinus", "PostfixMinusMinus"};
-	
-	static final String[] immediate = new String[] {"x", "y"};
-	
-	static final String[] variable = new String[] {"xVar", "yVar", "xArray", "yArray"};
-	
-	static final String[] field = new String[] {"xField", "yField", "xStaticField", "yStaticField"};
-
-	static final String[] prefixList = new String[] {"foo.", "EvalTypeTests.", ""};
-
-	static public void main(String[] args) throws Exception {
-		
-		genTestsNumericTypeAllOpsAllTypes(T_byte);
-		genTestsNumericTypeAllOpsAllTypes(T_char);
-		genTestsNumericTypeAllOpsAllTypes(T_short);
-		genTestsNumericTypeAllOpsAllTypes(T_int);
-		genTestsNumericTypeAllOpsAllTypes(T_long);
-		genTestsNumericTypeAllOpsAllTypes(T_float);
-		genTestsNumericTypeAllOpsAllTypes(T_double);
-		genTestsBooleanAllOpsBoolean();
-		genTestsStringPlusOpAllTypes();
-		
-		genTestsLocalVarValue();
-		
-		genTestsLocalVarAssignment();
-		
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_byte);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_char);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_short);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_int);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_long);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_float);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_double);
-		genTestsBooleanAllAssignmentOpsBoolean();
-		genTestsStringPlusAssignmentOpAllTypes();
-		
-		genTestsNumericTypeCast();
-		
-		genTestsAllIntegerTypesAllXfixOps();
-		
-		genTestsQualifiedFieldValue();
-		genTestsQualifiedStaticFieldValue();
-		genTestsFieldValue();
-		genTestsStaticFieldValue();
-		
-		genTestsArrayValue();
-		genTestsArrayAssignment();
-		genTestsArrayAllocation();
-		genTestsArrayInitialization();
-
-		System.out.println("done");
-		
-	}
-
-	//-------------------------------
-	
-	public static void genTestsNumericTypeAllOpsAllTypes(int type) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = typeUpperName[type] + "OperatorsTests";
-		
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_plus, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, Op_plus, T_String, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_minus, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_multiply, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_divide, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_remainder, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_greater, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_greaterEqual, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_less, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_lessEqual, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_equalEqual, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_notEqual, code);
-		if (type != T_float && type != T_double) {
-			genTestsIntegerTypeShiftOpIntegerTypes(type, Op_leftShift, code);
-			genTestsIntegerTypeShiftOpIntegerTypes(type, Op_rightShift, code);
-			genTestsIntegerTypeShiftOpIntegerTypes(type, Op_unsignedRightShift, code);
-			genTestsIntegerTypeBooleanOpIntegerTypes(type, Op_or, code);
-			genTestsIntegerTypeBooleanOpIntegerTypes(type, Op_and, code);
-			genTestsIntegerTypeBooleanOpIntegerTypes(type, Op_xor, code);
-		}
-		
-		genTestUnaryOpNumericType(type, Op_plus, code);
-		genTestUnaryOpNumericType(type, Op_minus, code);
-		if (type != T_float && type != T_double) {
-			genTestUnaryOpNumericType(type, Op_twiddle, code);
-		}
-		
-		createJavaFile(className, "EvalSimpleTests", 15, 1, code);
-
-	}
-	
-	public static void genTestsBooleanAllOpsBoolean() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "BooleanOperatorsTests";
-		
-		genTestBooleanBinaryOpBoolean(Op_or, code);
-		genTestBooleanBinaryOpBoolean(Op_and, code);
-		genTestBooleanBinaryOpBoolean(Op_xor, code);
-		genTestUnaryOpBoolean(Op_not, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 15, 1, code);
-	}
-	
-	public static void genTestsStringPlusOpAllTypes() throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StringPlusOpTests";
-		
-		code.append("\t// " + typeName[T_String] + " " + opSymbol[Op_plus] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_String] + ", " + typeName[T_null] + "}\n" +
-					"\n");
-
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_byte, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_char, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_short, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_long, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_double, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_boolean, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_String, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_null, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 15, 1, code);
-	}
-	
-	public static void genTestsLocalVarValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "LocalVarValueTests";
-		
-		code.append("\t// \n" +
-					"\n");
-					
-		genTestLocalVarValue(T_byte, code);
-		genTestLocalVarValue(T_char, code);
-		genTestLocalVarValue(T_short, code);
-		genTestLocalVarValue(T_int, code);
-		genTestLocalVarValue(T_long, code);
-		genTestLocalVarValue(T_float, code);
-		genTestLocalVarValue(T_double, code);
-		genTestLocalVarValue(T_String, code);
-		genTestLocalVarValue(T_boolean, code);
-//		genTestLocalVarValue(T_null, code);
-
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-	}
-	
-	public static void genTestsLocalVarAssignment() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "LocalVarAssignmentTests";
-		
-		code.append("\t// \n" +
-					"\n");
-					
-		genTestLocalVarAssignment(T_byte, code);
-		genTestLocalVarAssignment(T_char, code);
-		genTestLocalVarAssignment(T_short, code);
-		genTestLocalVarAssignment(T_int, code);
-		genTestLocalVarAssignment(T_long, code);
-		genTestLocalVarAssignment(T_float, code);
-		genTestLocalVarAssignment(T_double, code);
-		genTestLocalVarAssignment(T_String, code);
-		genTestLocalVarAssignment(T_boolean, code);
-					
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-	}
-	
-	public static void genTestsNumericTypeAllAssignmentOpsAllTypes(int type) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = typeUpperName[type] + "AssignmentOperatorsTests";
-		
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_plusAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_minusAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_multiplyAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_divideAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_remainderAss, code);
-		if (type != T_float && type != T_double) {
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_leftShiftAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_rightShiftAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_unsignedRightShiftAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_orAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_andAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_xorAss, code);
-		}
-		
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-
-	}
-
-	public static void genTestsBooleanAllAssignmentOpsBoolean() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "BooleanAssignmentOperatorsTests";
-		
-		code.append("\t// " + typeName[T_boolean] + " " + opSymbol[Op_orAss] + " " + typeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_orAss, T_boolean, code);
-		
-		code.append("\t// " + typeName[T_boolean] + " " + opSymbol[Op_andAss] + " " + typeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_andAss, T_boolean, code);
-		
-		code.append("\t// " + typeName[T_boolean] + " " + opSymbol[Op_xorAss] + " " + typeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_xorAss, T_boolean, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-	}
-	
-	public static void genTestsStringPlusAssignmentOpAllTypes() throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StringPlusAssignmentOpTests";
-		
-		code.append("\t// " + typeName[T_String] + " " + opSymbol[Op_plusAss] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_String] + ", " + typeName[T_null] + "}\n" +
-					"\n");
-
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_byte, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_char, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_short, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_int, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_long, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_float, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_double, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_String, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_null, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-	}
-	
-	public static void genTestsNumericTypeCast() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "NumericTypesCastTests";
-		
-		genTestsNumericTypeCast(T_byte, code);
-		genTestsNumericTypeCast(T_char, code);
-		genTestsNumericTypeCast(T_short, code);
-		genTestsNumericTypeCast(T_int, code);
-		genTestsNumericTypeCast(T_long, code);
-		genTestsNumericTypeCast(T_float, code);
-		genTestsNumericTypeCast(T_double, code);
-					
-		createJavaFile(className, "EvalSimpleTests", 15, 1, code);
-	}
-	
-	public static void genTestsAllIntegerTypesAllXfixOps() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "XfixOperatorsTests";
-		
-		genTestsNumericTypeAllXfixOps(T_byte, code);
-		genTestsNumericTypeAllXfixOps(T_char, code);
-		genTestsNumericTypeAllXfixOps(T_short, code);
-		genTestsNumericTypeAllXfixOps(T_int, code);
-		genTestsNumericTypeAllXfixOps(T_long, code);
-		genTestsNumericTypeAllXfixOps(T_float, code);
-		genTestsNumericTypeAllXfixOps(T_double, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-	}
-	
-	public static void genTestsQualifiedFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "QualifiedFieldValueTests";
-		
-		genTestFieldValue(T_byte, 0, code);
-		genTestFieldValue(T_char, 0, code);
-		genTestFieldValue(T_short, 0, code);
-		genTestFieldValue(T_int, 0, code);
-		genTestFieldValue(T_long, 0, code);
-		genTestFieldValue(T_float, 0, code);
-		genTestFieldValue(T_double, 0, code);
-		genTestFieldValue(T_String, 0, code);
-		genTestFieldValue(T_boolean, 0, code);
-
-		createJavaFile(className, "EvalTypeTests", 73, 1, code);
-	}
-		
-	public static void genTestsQualifiedStaticFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "QualifiedStaticFieldValueTests";
-		
-		genTestStaticFieldValue(T_byte, 0, code);
-		genTestStaticFieldValue(T_char, 0, code);
-		genTestStaticFieldValue(T_short, 0, code);
-		genTestStaticFieldValue(T_int, 0, code);
-		genTestStaticFieldValue(T_long, 0, code);
-		genTestStaticFieldValue(T_float, 0, code);
-		genTestStaticFieldValue(T_double, 0, code);
-		genTestStaticFieldValue(T_String, 0, code);
-		genTestStaticFieldValue(T_boolean, 0, code);
-
-		createJavaFile(className, "EvalTypeTests", 73, 1, code);
-
-		code = new StringBuffer();
-		
-		className = "QualifiedStaticFieldValueTests2";
-		
-		genTestStaticFieldValue(T_byte, 1, code);
-		genTestStaticFieldValue(T_char, 1, code);
-		genTestStaticFieldValue(T_short, 1, code);
-		genTestStaticFieldValue(T_int, 1, code);
-		genTestStaticFieldValue(T_long, 1, code);
-		genTestStaticFieldValue(T_float, 1, code);
-		genTestStaticFieldValue(T_double, 1, code);
-		genTestStaticFieldValue(T_String, 1, code);
-		genTestStaticFieldValue(T_boolean, 1, code);
-
-		createJavaFile(className, "EvalTypeTests", 73, 1, code);
-	}
-		
-	public static void genTestsFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "FieldValueTests";
-		
-		genTestFieldValue(T_byte, 2, code);
-		genTestFieldValue(T_char, 2, code);
-		genTestFieldValue(T_short, 2, code);
-		genTestFieldValue(T_int, 2, code);
-		genTestFieldValue(T_long, 2, code);
-		genTestFieldValue(T_float, 2, code);
-		genTestFieldValue(T_double, 2, code);
-		genTestFieldValue(T_String, 2, code);
-		genTestFieldValue(T_boolean, 2, code);
-
-		createJavaFile(className, "EvalTypeTests", 63, 2, code);
-	}
-		
-	public static void genTestsStaticFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StaticFieldValueTests";
-		
-		genTestStaticFieldValue(T_byte, 2, code);
-		genTestStaticFieldValue(T_char, 2, code);
-		genTestStaticFieldValue(T_short, 2, code);
-		genTestStaticFieldValue(T_int, 2, code);
-		genTestStaticFieldValue(T_long, 2, code);
-		genTestStaticFieldValue(T_float, 2, code);
-		genTestStaticFieldValue(T_double, 2, code);
-		genTestStaticFieldValue(T_String, 2, code);
-		genTestStaticFieldValue(T_boolean, 2, code);
-
-		createJavaFile(className, "EvalTypeTests", 63, 2, code);
-
-		className = "StaticFieldValueTests2";
-		
-		createJavaFile(className, "EvalTypeTests", 67, 2, code);
-	}
-		
-	public static void genTestsArrayValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayValueTests";
-		
-		genTestArrayLength(T_byte, code);
-		genTestArrayLength(T_char, code);
-		genTestArrayLength(T_short, code);
-		genTestArrayLength(T_int, code);
-		genTestArrayLength(T_long, code);
-		genTestArrayLength(T_float, code);
-		genTestArrayLength(T_double, code);
-		genTestArrayLength(T_String, code);
-		genTestArrayLength(T_boolean, code);
-
-		genTestArrayValue(T_byte, code);
-		genTestArrayValue(T_char, code);
-		genTestArrayValue(T_short, code);
-		genTestArrayValue(T_int, code);
-		genTestArrayValue(T_long, code);
-		genTestArrayValue(T_float, code);
-		genTestArrayValue(T_double, code);
-		genTestArrayValue(T_String, code);
-		genTestArrayValue(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, code);
-	}
-		
-	public static void genTestsArrayAssignment() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayAssignementTests";
-		
-		genTestArrayAssignment(T_byte, code);
-		genTestArrayAssignment(T_char, code);
-		genTestArrayAssignment(T_short, code);
-		genTestArrayAssignment(T_int, code);
-		genTestArrayAssignment(T_long, code);
-		genTestArrayAssignment(T_float, code);
-		genTestArrayAssignment(T_double, code);
-		genTestArrayAssignment(T_String, code);
-		genTestArrayAssignment(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, code);
-	}
-		
-	public static void genTestsArrayAllocation() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayAllocationTests";
-		
-		genTestArrayAllocation(T_byte, code);
-		genTestArrayAllocation(T_char, code);
-		genTestArrayAllocation(T_short, code);
-		genTestArrayAllocation(T_int, code);
-		genTestArrayAllocation(T_long, code);
-		genTestArrayAllocation(T_float, code);
-		genTestArrayAllocation(T_double, code);
-		genTestArrayAllocation(T_String, code);
-		genTestArrayAllocation(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, code);
-	}
-		
-	public static void genTestsArrayInitialization() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayInitializationTests";
-		
-		genTestArrayInitialization(T_byte, code);
-		genTestArrayInitialization(T_char, code);
-		genTestArrayInitialization(T_short, code);
-		genTestArrayInitialization(T_int, code);
-		genTestArrayInitialization(T_long, code);
-		genTestArrayInitialization(T_float, code);
-		genTestArrayInitialization(T_double, code);
-		genTestArrayInitialization(T_String, code);
-		genTestArrayInitialization(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, code);
-	}
-	//----------------------------
-	
-	public static void genTestsNumericTypeArithmeticOpNumericTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[T_double] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_char, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_short, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_long, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_float, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_double, code);
-		
-	}
-	
-	public static void genTestsNumericTypeComparisonOpNumericTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[T_double] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_char, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_short, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_int, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_long, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_float, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_double, code);
-		
-	}
-	
-	public static void genTestsIntegerTypeShiftOpIntegerTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_char, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_short, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_int, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_long, code);
-		
-	}
-	
-	public static void genTestsIntegerTypeBooleanOpIntegerTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_char, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_short, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_long, code);
-		
-	}
-	
-	public static void genTestsNumericTypeArithmeticAssignmentOpNumericTypes(int type, int op, StringBuffer code) {
-
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[T_double] + "}\n" +
-					"\n");
-
-		genTestTypeAssignmentOpType(type, op, T_byte, code);
-		genTestTypeAssignmentOpType(type, op, T_char, code);
-		genTestTypeAssignmentOpType(type, op, T_short, code);
-		genTestTypeAssignmentOpType(type, op, T_int, code);
-		genTestTypeAssignmentOpType(type, op, T_long, code);
-		genTestTypeAssignmentOpType(type, op, T_float, code);
-		genTestTypeAssignmentOpType(type, op, T_double, code);
-
-	}
-	
-	public static void genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(int type, int op, StringBuffer code) {
-
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[T_double] + "}\n" +
-					"\n");
-
-		genTestTypeAssignmentOpType(type, op, T_byte, code);
-		genTestTypeAssignmentOpType(type, op, T_char, code);
-		genTestTypeAssignmentOpType(type, op, T_short, code);
-		genTestTypeAssignmentOpType(type, op, T_int, code);
-		genTestTypeAssignmentOpType(type, op, T_long, code);
-
-	}
-	
-	public static void genTestsNumericTypeCast(int type, StringBuffer code) {
-		
-		code.append("\t// (" + typeName[type] + ") {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[T_double] + "}\n" +
-					"\n");
-		
-		genTestNumericTypeCast(type, T_byte, code);
-		genTestNumericTypeCast(type, T_char, code);
-		genTestNumericTypeCast(type, T_short, code);
-		genTestNumericTypeCast(type, T_int, code);
-		genTestNumericTypeCast(type, T_long, code);
-		genTestNumericTypeCast(type, T_float, code);
-		genTestNumericTypeCast(type, T_double, code);
-		
-	}
-
-	public static void genTestsNumericTypeAllXfixOps(int type, StringBuffer code) {
-		
-		code.append("\t// {" + opSymbol[Op_prefixPlusPlus] + ", " + opSymbol[Op_prefixMinusMinus] + "} " + typeName[type] + "\n" +
-					"\t// " + typeName[type] + " {" + opSymbol[Op_postfixPlusPlus] + ", " + opSymbol[Op_postfixMinusMinus] + "}\n" +
-					"\n");
-					
-		genTestNumericTypePrefixOp(type, Op_prefixPlusPlus, code);
-		genTestNumericTypePrefixOp(type, Op_prefixMinusMinus, code);
-		genTestNumericTypePostfixOp(type, Op_postfixPlusPlus, code);
-		genTestNumericTypePostfixOp(type, Op_postfixMinusMinus, code);
-	}
-		
-	//----------------------------
-
-	public static void genTestTypeBinaryOpTypeBinaryPromotion(int type1, int op, int type2, StringBuffer code) {
-		
-		int promotedType = getPromotionType(type1, type2);
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 1, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 1, 0, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestTypeBinaryOpTypeBooleanResult(int type1, int op, int type2, StringBuffer code) {
-		
-		int promotedType = T_boolean;
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 1, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 1, 0, false, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 0, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-
-	}
-
-	public static void genTestTypeBinaryOpTypeUnaryPromotion(int type1, int op, int type2, StringBuffer code) {
-		
-		int promotedType = getUnaryPromotionType(type1);
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 1, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 1, 0, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestBooleanBinaryOpBoolean(int op, StringBuffer code) {
-		
-		int type = T_boolean;
-		
-		String uName = typeUpperName[type];
-		String oUName = opUpperName[op];
-		
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " " + typeName[type] + "\n" +
-					"\n");
-		
-		code.append("\tpublic void test" + uName + oUName + uName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type, op, type, type, 0, 0, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type, op, type, type, 0, 1, false, code);
-		code.append("\n");
-		genCodeBinaryOp(type, op, type, type, 1, 0, false, code);
-		code.append("\n");
-		genCodeBinaryOp(type, op, type, type, 1, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-
-	}
-
-	public static void genTestUnaryOpNumericType(int type, int op, StringBuffer code) {
-		
-		int promotedType = getUnaryPromotionType(type);
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String oSymbol = opSymbol[op];
-		String oUName = opUpperName[op];
-		
-		code.append("\t// " + oSymbol + " " + tName + "\n" +
-					"\n");
-		
-		code.append("\tpublic void test" + oUName + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeUnaryOp(type, op, promotedType, 0, true, code);
-		code.append("\n");
-		genCodeUnaryOp(type, op, promotedType, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestUnaryOpBoolean(int op, StringBuffer code) {
-		
-		int type = T_boolean;
-		
-		String uName = typeUpperName[type];
-		String oUName = opUpperName[op];
-		
-		code.append("\t// " + opSymbol[op] + " " + typeName[type] + "\n" +
-					"\n");
-		
-		code.append("\tpublic void test" + oUName + uName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeUnaryOp(type, op, type, 0, true, code);
-		code.append("\n");
-		genCodeUnaryOp(type, op, type, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-
-	}
-
-	public static void genTestLocalVarValue(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeLocalVarValue(type, 0, true, code);
-		code.append("\n");
-		genCodeLocalVarValue(type, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestLocalVarAssignment(int type, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeLocalVarAssignment(type, 0, 0, true, code);
-		code.append("\n");
-		genCodeLocalVarAssignment(type, 0, 1, false, code);
-		code.append("\n");
-		genCodeLocalVarAssignment(type, 1, 0, false, code);
-		code.append("\n");
-		genCodeLocalVarAssignment(type, 1, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestTypeAssignmentOpType(int type1, int op, int type2, StringBuffer code) {
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeSetTmp("tmp" + variable[0], type1, Op_equal, variable[0] + t1UName + "Value", true, code);
-		genCodeSetTmp("tmp" + variable[0], type1, op, immediate[0] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 0, 0, true, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + variable[0], type1, op, immediate[1] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 0, 1, false, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + variable[1], type1, Op_equal, variable[1] + t1UName + "Value", true, code);
-		genCodeSetTmp("tmp" + variable[1], type1, op, immediate[0] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 1, 0, false, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + variable[1], type1, op, immediate[1] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 1, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestNumericTypeCast(int type1, int type2, StringBuffer code) {
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		
-		code.append("\tpublic void test" + t1UName + "Cast" + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeCast(type1, type2, 0, true, code);
-		code.append("\n");
-		genCodeCast(type1, type2, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-		
-	}
-		
-	public static void genTestNumericTypePrefixOp(int type, int op, StringBuffer code) {
-
-		String tUName = typeUpperName[type];
-		String oUName = opUpperName[op];
-
-		code.append("\tpublic void test" + oUName + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodePrefixOp(type, op, 0, true, code);
-		code.append("\n");
-		genCodePrefixOp(type, op, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestNumericTypePostfixOp(int type, int op, StringBuffer code) {
-
-		String tUName = typeUpperName[type];
-		String oUName = opUpperName[op];
-
-		code.append("\tpublic void test" + oUName + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodePostfixOp(type, op, 0, true, code);
-		code.append("\n");
-		genCodePostfixOp(type, op, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestFieldValue(int type, int prefix, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "FieldValue() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeFieldValue(type, 0, prefix, true, code);
-		code.append("\n");
-		genCodeFieldValue(type, 1, prefix, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestStaticFieldValue(int type, int prefix, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "StaticFieldValue() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeFieldValue(type, 2, prefix, true, code);
-		code.append("\n");
-		genCodeFieldValue(type, 3, prefix, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayValue(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayValue() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayValue(type, 2, 0, true, code);
-		code.append("\n");
-		genCodeArrayValue(type, 2, 1, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 2, 2, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 3, 0, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 3, 1, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 3, 2, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayLength(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayLength() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayLength(type, 2, true, code);
-		code.append("\n");
-		genCodeArrayLength(type, 3, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayAssignment(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayAssignment() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayAssignment(type, 2, 0, 0, true, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 2, 1, 1, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 2, 2, 0, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 3, 0, 1, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 3, 1, 0, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 3, 2, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayAllocation(int type, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayAllocation() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayAllocation(type, 2, 0, true, code);
-		code.append("\n");
-		genCodeArrayAllocation(type, 3, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestArrayInitialization(int type, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayAllocation() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayInitialization(type, 2, true, code);
-		code.append("\n");
-		genCodeArrayInitialization(type, 3, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	//-------------------------------
-
-	public static void genCodeBinaryOp(int type1, int op, int type2, int resultType, int var1, int var2, boolean first, StringBuffer code) {
-		
-		String t1Name = typeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = typeName[type2];
-		String t2UName = typeUpperName[type2];
-		String resName = typeName[resultType];
-		String resUName = typeUpperName[resultType];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		String v1Name = immediate[var1];
-		String v2Name = immediate[var2];
-		
-		genCodeEval(v1Name + t1UName + " + " + oName + "Op + " + v2Name + t2UName, first, code);
-		genCodeReturnTypeCheck(t1Name + " " + oName + " " + t2Name, resName, first, code);
-		switch (resultType) {
-			case T_String:
-				genCodeReturnValueCheckStringType(t1Name + " " + oName + " " + t2Name, v1Name + t1UName + "Value " + oSymbol + " " + v2Name + t2UName + "Value", first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(t1Name + " " + oName + " " + t2Name, resName, resUName, v1Name + t1UName + "Value " + oSymbol + " " + v2Name + t2UName + "Value", first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(t1Name + " " + oName + " " + t2Name, resName, resUName, v1Name + t1UName + "Value " + oSymbol + " " + v2Name + t2UName + "Value", first, code);
-				break;
-		}
-	}
-
-	public static void genCodeUnaryOp(int type, int op, int resultType, int var, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String resName = typeName[resultType];
-		String resUName = typeUpperName[resultType];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		String vName = immediate[var];
-
-		genCodeEval(oName + "Op + " + vName + tUName, first, code);
-		genCodeReturnTypeCheck(oName + " " + tName, resName, first, code);
-		if (type == T_float || type == T_double) {
-			genCodeReturnValueCheckFloatDoubleType(oName + " " + tName, resName, resUName, oSymbol + " " + vName + tUName + "Value", first, code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType(oName + " " + tName, resName, resUName, oSymbol + " " + vName + tUName + "Value", first, code);
-		}
-	}
-	
-	public static void genCodeLocalVarValue(int type, int var, boolean first, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-
-		genCodeLocalVarValue(type,var, vName + tUName + "Value", first, code);
-	}
-
-	public static void genCodeLocalVarValue(int type, int var, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-
-		genCodeEval(vName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " local variable value", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " local variable value", referenceExpression, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " local variable value", tName, tUName, referenceExpression, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " local variable value", tName, tUName, referenceExpression, first, code);
-				break;
-		}
-	}
-	
-	public static void genCodeLocalVarAssignment(int type, int var, int imm, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-		String iName = immediate[imm];
-		String oName = opName[Op_equal];
-
-		genCodeEval(vName + tUName + " + " + oName + "Op +" + iName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " local variable assignment", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " local variable assignment", iName + tUName + "Value", first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " local variable assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " local variable assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-		}
-		genCodeLocalVarValue(type, var, iName + tUName + "Value", false, code);
-	}
-	
-	public static void genCodeAssignmentOp(int type1, int op, int type2, int var, int imm, boolean first, StringBuffer code) {
-		String t1Name = typeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = typeName[type2];
-		String t2UName = typeUpperName[type2];
-		String oName = opName[op];
-		String vName = variable[var];
-		String iName = immediate[imm];
-		
-		genCodeEval(vName + t1UName + " + " + oName + "Op + " + iName + t2UName, first, code);
-		genCodeReturnTypeCheck(t1Name + " " + oName + " " + t2Name, t1Name, first, code);
-		switch (type1) {
-			case T_String:
-				genCodeReturnValueCheckStringType(t1Name + " " + oName + " " + t2Name, "tmp" + vName, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(t1Name + " " + oName + " " + t2Name, t1Name, t1UName, "tmp" + vName, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(t1Name + " " + oName + " " + t2Name, t1Name, t1UName, "tmp" + vName, first, code);
-				break;
-		}
-		genCodeLocalVarValue(type1, var, "tmp" + vName, false, code);
-	}
-	
-	public static void genCodeCast(int type1, int type2, int imm, boolean first, StringBuffer code) {
-		String t1Name = typeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = typeName[type2];
-		String t2UName = typeUpperName[type2];
-		String iName = immediate[imm];
-
-		genCodeEval("\"(" + t1Name + ")\" + " + iName + t2UName, first, code);
-		genCodeReturnTypeCheck("(" + t1Name + ") " + t2Name, t1Name, first, code);
-		if (type1 == T_float || type1 == T_double) {
-			genCodeReturnValueCheckFloatDoubleType("(" + t1Name + ") " + t2Name, t1Name, t1UName, "( " + t1Name + ") " + iName + t2UName + "Value", first, code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType("(" + t1Name + ") " + t2Name, t1Name, t1UName, "( " + t1Name + ") " + iName + t2UName + "Value", first, code);
-		}
-	}
-	
-	public static void genCodePrefixOp(int type, int op, int var, boolean first, StringBuffer code) {
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		
-		genCodeSetTmp("tmp" + vName, type, Op_equal, vName + tUName + "Value", true, code);
-		genCodeEval(oName + "Op + " + vName + tUName, first, code);
-		genCodeReturnTypeCheck(oName + " " + tName, tName, first, code);
-		if (type == T_float || type == T_double) {
-			genCodeReturnValueCheckFloatDoubleType(oName + " " + tName, tName, tUName, oSymbol + "tmp" + vName, first,code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType(oName + " " + tName, tName, tUName, oSymbol + "tmp" + vName, first,code);
-		}
-		genCodeLocalVarValue(type, var, "tmp" + vName, false, code);
-	}
-	
-	public static void genCodePostfixOp(int type, int op, int var, boolean first, StringBuffer code) {
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		
-		genCodeSetTmp("tmp" + vName, type, Op_equal, vName + tUName + "Value", true, code);
-		genCodeEval(vName + tUName + " + " + oName + "Op", first, code);
-		genCodeReturnTypeCheck(tName + " " + oName, tName, first, code);
-		if (type == T_float || type == T_double) {
-			genCodeReturnValueCheckFloatDoubleType(tName + " " + oName, tName, tUName, "tmp" + vName + oSymbol, first,code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType(tName + " " + oName, tName, tUName, "tmp" + vName + oSymbol, first,code);
-		}
-		genCodeLocalVarValue(type, var, "tmp" + vName, false, code);
-	}
-	
-	public static void genCodeFieldValue(int type, int var, int prefix, boolean first, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		String fName = field[var];
-
-		genCodeFieldValue(type, var, prefix, fName + tUName + "Value", first, code);
-	}
-
-	public static void genCodeFieldValue(int type, int var, int prefix, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String fName = field[var];
-		String prefixVal = prefixList[prefix];
-
-		genCodeEval("\"" + prefixVal + "\" + " + fName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " field value", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " field value", referenceExpression, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " field value", tName, tUName, referenceExpression, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " field value", tName, tUName, referenceExpression, first, code);
-				break;
-		}
-	}
-	
-	public static void genCodeArrayLength(int type, int var, boolean first, StringBuffer code) {
-		
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-		
-		genCodeArrayLength(type, var, vName + tUName + "Value.length", first, code);
-		
-	}
-
-	public static void genCodeArrayLength(int type, int var, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-
-		genCodeEval(vName + tUName + " + \".length\"", first, code);
-		genCodeReturnTypeCheck(tName + " array length", typeName[T_int], first,code);
-		genCodeReturnValueCheckPrimitiveType(tName + " array length", typeName[T_int], typeUpperName[T_int], referenceExpression, first, code);
-	}
-	
-	public static void genCodeArrayValue(int type, int var, int index, boolean first, StringBuffer code) {
-		
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-
-		genCodeArrayValue(type, var, index, vName + tUName + "Value[" + index + "]", first, code);
-	}
-
-	public static void genCodeArrayValue(int type, int var, int index, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-
-		genCodeEval(vName + tUName + " + \"[" + index + "]\"", first, code);
-		genCodeReturnTypeCheck(tName + " array value", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " array value", referenceExpression, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " array value", tName, tUName, referenceExpression, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " array value", tName, tUName, referenceExpression, first, code);
-				break;
-		}
-	}
-	
-	public static void genCodeArrayAssignment(int type, int var, int index, int imm, boolean first, StringBuffer code) {
-		
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-		String iName = immediate[imm];
-		String oName = opName[Op_equal];
-
-		genCodeEval(vName + tUName + " + \"[" + index + "]\" + " + oName + "Op +" + iName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " array assignment", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " array assignment", iName + tUName + "Value", first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " array assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " array assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-		}
-		genCodeArrayValue(type, var, index, iName + tUName + "Value", false, code);
-	}
-	
-	public static void genCodeArrayAllocation(int type, int var, int dim, boolean first, StringBuffer code) {
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String charUName = typeUpperName[T_char];
-		String vName = variable[var];
-		String iName = immediate[dim];
-		String oName = opName[Op_equal];
-
-		genCodeEval(vName + tUName + " + " + oName + "Op + \"new " + tName + "[\" + " + iName + charUName + " + \"]\"", first, code);
-		genCodeReturnTypeCheck(tName + " array assignment", tName + "[]", first, code);
-		if (first) {
-			genCodeSetTmp("intValue", T_int, Op_equal, "0", true, code);
-		}
-		genCodeArrayLength(type, var, iName + charUName + "Value", false, code);
-	}
-
-	public static void genCodeArrayInitialization(int type, int var, boolean first, StringBuffer code) {
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-		String oName = opName[Op_equal];
-		String i1Name = immediate[(var + 1) % 2];
-		
-		String value = "";
-		boolean f = true;
-		for (int i = 0; i < var; i ++) {
-			if (f) {
-				f = false;
-			} else {
-				value += " + \", \" + ";
-			}
-			value += immediate[i % 2] + tUName;
-		}
-
-		genCodeEval(vName + tUName + " + " + oName + "Op + \"new " + tName + "[]{\" + " + value + " + \"}\"", first, code);
-		genCodeReturnTypeCheck(tName + " array assignment", tName + "[]", first, code);
-		if (first) {
-			genCodeSetTmp("intValue", T_int, Op_equal, "0", true, code);
-			if (type != T_int) {
-				genCodeSetTmp(((type == T_String)? "string" : tName) + "Value", type, Op_equal, i1Name + tUName + "Value", true, code);
-			}
-		}
-		genCodeArrayLength(type, var, "" + var, false, code);
-		for (int i = 0; i < var; i++) {
-			genCodeArrayValue(type, var, i, immediate[i % 2] + tUName + "Value", false, code);
-		}
-	}
-	
-	//----------------------------
-	
-	public static void genCodeEval(String expression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "IValue " : "") + "value = eval(" + expression + ");\n");
-	}
-	
-	public static void genCodeReturnTypeCheck(String test, String typeName, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "String " : "") + "typeName = value.getReferenceTypeName();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong type : \", \"" + typeName + "\", typeName);\n");
-	}
-	
-	public static void genCodeReturnValueCheckPrimitiveType(String test, String resType, String uResType, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? resType + " " : "") + resType + "Value = ((IJavaPrimitiveValue)value).get" + uResType + "Value();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \", " + referenceExpression + ", " + resType+ "Value);\n");
-	}
-
-	public static void genCodeReturnValueCheckFloatDoubleType(String test, String resType, String uResType, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? resType + " " : "") + resType + "Value = ((IJavaPrimitiveValue)value).get" + uResType + "Value();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \", " + referenceExpression + ", " + resType+ "Value, 0);\n");
-	}
-
-	public static void genCodeReturnValueCheckStringType(String test, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "String " : "") + "stringValue = ((JDIObjectValue)value).getValueString();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \", " + referenceExpression + ", " + "stringValue);\n");
-	}
-
-/*	public static void genCodeReturnValueCheckObjectType(String test, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "Object " : "") + "objectValue = ((JDIObjectValue)value).getValueString();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \" + " + "objectValue, " + "objectValue, " + referenceExpression + ");\n");
-	}*/
-
-	public static void genCodeSetTmp(String varName, int type, int op, String value, boolean init , StringBuffer code) {
-		code.append("\t\t" + ((init)? typeName[type] + " " : "") + varName + " " + opSymbol[op] + " " + value + ";\n");
-	}
-	
-	
-	public static void tryBlockBegin(StringBuffer code) {
-		code.append("\t\ttry {\n\t\tinit();\n");
-	}
-
-	public static void tryBlockEnd(StringBuffer code) {
-		code.append("\t\t} catch (Throwable e) {\n\t\te.printStackTrace(); throw e;\n\t\t} finally {;\n\t\tend();\n\t\t}\n");
-	}
-
-	//------------------------------
-
-	public static void createJavaFile(String className, String testClass, int breakPointLine, int frameNumber, StringBuffer tests) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n" +
-					"import junit.framework.Test;\n" +
-					"import junit.framework.TestSuite;\n" +
-					"import org.eclipse.core.resources.ResourcesPlugin;\n" +
-					"import org.eclipse.debug.core.model.IValue;\n" +
-					"import org.eclipse.jdt.core.JavaCore;\n" +
-					"import org.eclipse.jdt.debug.core.IJavaDebugTarget;\n" +
-					"import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n" +
-					"import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n" +
-					"\n" +
-					"public class " + className + " extends Tests {\n" +
-					"\n" +
-					"\tpublic " + className + "(String arg) {\n" +
-					"\t\tsuper(arg);\n" +
-					"\t}\n" +
-					"\n" +
-					"\tprotected void init() throws Exception {\n" +
-					"\t\tinitializeFrame(\"" + testClass + "\"," + breakPointLine + "," + frameNumber + ");\n" +
-					"\t}\n" +
-					"\n" +
-					"\tprotected void end() throws Exception {\n" +
-					"\t\tdestroyFrame();\n" +
-					"\t}\n\n");
-					
-		code.append(tests);
-					
-		code.append("\n}\n");
-					
-		Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
deleted file mode 100644
index 4db66a0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class TypeHierarchyTestsGenerator extends TestGenerator {
-
-	static int IAA= 0;
-	static int IAB= 1;
-	static int IAC= 2;
-	static int AA= 3;
-	static int AB= 4;
-	static int AC= 5;
-	static int IBB= 6;
-	static int IBC= 7;
-	static int BB= 8;
-	static int BC= 9;
-	static int ICC= 10;
-	static int CC= 11;
-	static int N_A= 12;
-	static int N_B= 13;
-	static int N_C= 14;
-	
-	static int SUPER_A= 15;
-	static int SUPER_B= 16;
-	
-	static int M1= 0;
-	static int M2= 1;
-	static int S2= 2;
-	static int M3= 3;
-	static int M4= 4;
-	static int S4= 5;
-	static int M5= 6;
-	static int M6= 7;
-	static int S6= 8;
-	
-	static String[] qualifiers= new String[] {
-		"iaa", "iab", "iac",     "aa",      "ab",      "ac", "ibb", "ibc", "bb", "bc",
-		"icc", "cc",  "new A()", "new B()", "new C()" ,"super" , "super"};
-		
-	static String[] methods= new String[] {"m1", "m2", "s2", "m3", "m4", "s4", "m5", "m6", "s6"};
-	
-	static int[] staticLevel= new int[] {
-		0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
-		2, 2, 0, 1, 2, 0, 1};
-
-	static int[] instanceLevel= new int[] {
-		0, 1, 2, 0, 1, 2, 1, 2, 1, 2,
-		2, 2, 0, 1, 2, 0, 1};
-		
-	static int[][] values= new int[][] {
-		{ 1, 2, 9},
-		{ 11, 22, 99, 33, 44, 88},
-		{ 111, 222, 999, 333, 444, 888, 555, 666, 777}
-	};
-
-	public static void main(String[] args) throws Exception {
-		gen_main();
-		gen_aa_testA();
-		gen_ab_testA();
-		gen_ac_testA();
-		gen_bb_testA();
-		gen_bb_testB();
-		gen_bc_testA();
-		gen_bc_testB();
-		gen_cc_testA();
-		gen_cc_testB();
-		gen_cc_testC();
-		
-		System.out.println("done");
-	}
-	
-	public static void  gen_main() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTestQualifier(IAA, M1, code);
-		createTestQualifier(IAB, M1, code);
-		createTestQualifier(IAC, M1, code);
-		createTestQualifier(AA, M1, code);
-		createTestQualifier(AA, M2, code);
-		createTestQualifier(AA, S2, code);
-		createTestQualifier(AB, M1, code);
-		createTestQualifier(AB, M2, code);
-		createTestQualifier(AB, S2, code);
-		createTestQualifier(AC, M1, code);
-		createTestQualifier(AC, M2, code);
-		createTestQualifier(AC, S2, code);
-		createTestQualifier(IBB, M1, code);
-		createTestQualifier(IBB, M3, code);
-		createTestQualifier(IBC, M1, code);
-		createTestQualifier(IBC, M3, code);
-		createTestQualifier(BB, M1, code);
-		createTestQualifier(BB, M2, code);
-		createTestQualifier(BB, S2, code);
-		createTestQualifier(BB, M3, code);
-		createTestQualifier(BB, M4, code);
-		createTestQualifier(BB, S4, code);
-		createTestQualifier(BC, M1, code);
-		createTestQualifier(BC, M2, code);
-		createTestQualifier(BC, S2, code);
-		createTestQualifier(BC, M3, code);
-		createTestQualifier(BC, M4, code);
-		createTestQualifier(BC, S4, code);
-		createTestQualifier(ICC, M1, code);
-		createTestQualifier(ICC, M3, code);
-		createTestQualifier(ICC, M5, code);
-		createTestQualifier(CC, M1, code);
-		createTestQualifier(CC, M2, code);
-		createTestQualifier(CC, S2, code);
-		createTestQualifier(CC, M3, code);
-		createTestQualifier(CC, M4, code);
-		createTestQualifier(CC, S4, code);
-		createTestQualifier(CC, M5, code);
-		createTestQualifier(CC, M6, code);
-		createTestQualifier(CC, S6, code);
-		
-		createTestQualifier(N_A, M1, code);
-		createTestQualifier(N_A, M2, code);
-		createTestQualifier(N_A, S2, code);
-		createTestQualifier(N_B, M1, code);
-		createTestQualifier(N_B, M2, code);
-		createTestQualifier(N_B, S2, code);
-		createTestQualifier(N_B, M3, code);
-		createTestQualifier(N_B, M4, code);
-		createTestQualifier(N_B, S4, code);
-		createTestQualifier(N_C, M1, code);
-		createTestQualifier(N_C, M2, code);
-		createTestQualifier(N_C, S2, code);
-		createTestQualifier(N_C, M3, code);
-		createTestQualifier(N_C, M4, code);
-		createTestQualifier(N_C, S4, code);
-		createTestQualifier(N_C, M5, code);
-		createTestQualifier(N_C, M6, code);
-		createTestQualifier(N_C, S6, code);
-
-		createJavaFile(code, 146, 1, 1);
-	}
-	
-	public static void gen_aa_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AA);
-		
-		createJavaFile(code, 32, 2, 1);
-	}
-
-	public static void gen_ab_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AB);
-		
-		createJavaFile(code, 32, 2, 2);
-	}
-
-	public static void gen_ac_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AC);
-		
-		createJavaFile(code, 32, 2, 3);
-	}
-
-	public static void gen_bb_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, BB);
-		
-		createJavaFile(code, 32, 2, 4);
-	}
-
-	public static void gen_bc_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, BC);
-		
-		createJavaFile(code, 32, 2, 5);
-	}
-
-	public static void gen_cc_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, CC);
-		
-		createJavaFile(code, 32, 2, 6);
-	}
-
-	public static void gen_bb_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, BB);
-		
-		createJavaFile(code, 68, 2, 1);
-	}
-
-	public static void gen_bc_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, BC);
-		
-		createJavaFile(code, 68, 2, 2);
-	}
-
-	public static void gen_cc_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, CC);
-		
-		createJavaFile(code, 68, 2, 3);
-	}
-
-	public static void gen_cc_testC() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestC(code, CC);
-		
-		createJavaFile(code, 119, 2, 1);
-	}
-
-	//-------------	
-
-	public static void createTest_TestA(StringBuffer code, int qualifier) {
-		createTest(instanceLevel[qualifier], M1, code);
-		createTest(instanceLevel[qualifier], M2, code);
-		createTest(0, S2, code);
-	}
-
-	public static void createTest_TestB(StringBuffer code, int qualifier) {
-		createTest(instanceLevel[qualifier], M1, code);
-		createTest(instanceLevel[qualifier], M2, code);
-		createTest(1, S2, code);
-		createTest(instanceLevel[qualifier], M3, code);
-		createTest(instanceLevel[qualifier], M4, code);
-		createTest(1, S4, code);
-		createTestQualifier(SUPER_A, M1, code);
-		createTestQualifier(SUPER_A, M2, code);
-	}
-
-	public static void createTest_TestC(StringBuffer code, int qualifier) {
-		createTest(instanceLevel[qualifier], M1, code);
-		createTest(instanceLevel[qualifier], M2, code);
-		createTest(2, S2, code);
-		createTest(instanceLevel[qualifier], M3, code);
-		createTest(instanceLevel[qualifier], M4, code);
-		createTest(2, S4, code);
-		createTest(instanceLevel[qualifier], M5, code);
-		createTest(instanceLevel[qualifier], M6, code);
-		createTest(2, S6, code);
-		createTestQualifier(SUPER_B, M1, code);
-		createTestQualifier(SUPER_B, M2, code);
-		createTestQualifier(SUPER_B, M3, code);
-		createTestQualifier(SUPER_B, M4, code);
-	}
-
-	//-------------
-
-	public static void createTest(int level, int method, StringBuffer code) {
-		String strMethod= methods[method];
-		code.append("\tpublic void testEvalNestedTypeTest_" + strMethod + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("\"" + strMethod + "()\"", true, code);
-		genCodeReturnTypeCheck(strMethod, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType(strMethod, "int", "Int", "" + values[level][method], true, code);
-
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	
-	public static void createTestQualifier(int qualifier, int method, StringBuffer code) {
-		String strQualifier= qualifiers[qualifier];
-		String nameQualifier= strQualifier.replace('(', '_').replace(')', '_').replace(' ', '_');
-		String strMethod= methods[method];
-		int[] level= ((method + 1) % 3 == 0) ? staticLevel : instanceLevel;
-		code.append("\tpublic void testEvalNestedTypeTest_" + nameQualifier + "_" + strMethod + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("\"" + strQualifier + "." + strMethod + "()\"", true, code);
-		genCodeReturnTypeCheck(strQualifier + "." + strMethod, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType(strQualifier + "." + strMethod, "int", "Int", "" + values[level[qualifier]][method], true, code);
-
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	//------------
-	
-	
-	public static void createJavaFile(StringBuffer tests, int lineNumber, int numberFrames, int hitCount) throws Exception {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("/**********************************************************************\n");
-		code.append("Copyright (c) 2000, 2002 IBM Corp. and others.\n");
-		code.append("All rights reserved. This program and the accompanying materials\n");
-		code.append("are made available under the terms of the Common Public License v1.0\n");
-		code.append("which accompanies this distribution, and is available at\n");
-		code.append("http://www.eclipse.org/legal/cpl-v10.html\n\n");
-		code.append("Contributors:\n");
-		code.append("    IBM Corporation - Initial implementation\n");
-		code.append("*********************************************************************/\n\n");
-		code.append("import org.eclipse.debug.core.model.IValue;\n");
-		code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n\n");
-		code.append("public class TypeHierarchy_" + lineNumber + "_" + hitCount + " extends Tests {\n");
-		code.append("\t/**\n");
-		code.append("\t * Constructor for TypeHierarchy.\n");
-		code.append("\t * @param name\n");
-		code.append("\t */\n");
-		code.append("\tpublic TypeHierarchy_" + lineNumber + "_" + hitCount + "(String name) {\n");
-		code.append("\t\tsuper(name);\n");
-		code.append("\t}\n\n");
-		code.append("\tpublic void init() throws Exception {\n");
-		code.append("\t\tinitializeFrame(\"EvalTypeHierarchyTests\", " + lineNumber + ", " + numberFrames + ", " + hitCount + ");\n");
-		code.append("\t}\n\n");
-		code.append("\tprotected void end() throws Exception {\n");
-		code.append("\t\tdestroyFrame();\n");
-		code.append("\t}\n\n");
-		
-		code.append(tests.toString());
-		
-		code.append("}\n");
-		
-		Writer file = new FileWriter(new File("TypeHierarchy_" + lineNumber + "_" + hitCount + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug/buildnotes_jdt-debug.html b/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
index 93fad84..7a689a9 100644
--- a/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
+++ b/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
@@ -18,7 +18,6 @@
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25151">25151</a>: Missing mneumonics on "Edit Detail Formatter", "New Detail Formatter"<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25243">25243</a>: Missing on "Edit Detail Formatter", "New Detail Formatter" expressions<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24720">24720</a>: ReferenceTypeImpl performance issue<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=1611">1611</a>: Console preferences (1GETAZ6)<br>
 
 <h1>
 Eclipse Platform Build Notes&nbsp;<br>
diff --git a/org.eclipse.jdt.launching.macosx/.classpath b/org.eclipse.jdt.launching.macosx/.classpath
deleted file mode 100644
index ce25a08..0000000
--- a/org.eclipse.jdt.launching.macosx/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="macosx"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.launching"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.launching.macosx/.cvsignore b/org.eclipse.jdt.launching.macosx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.launching.macosx/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.launching.macosx/.project b/org.eclipse.jdt.launching.macosx/.project
deleted file mode 100644
index 98ca1ce..0000000
--- a/org.eclipse.jdt.launching.macosx/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.launching.macosx</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug</project>
-		<project>org.eclipse.jdt.launching</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.launching.macosx/about.html b/org.eclipse.jdt.launching.macosx/about.html
deleted file mode 100644
index 441774f..0000000
--- a/org.eclipse.jdt.launching.macosx/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>
-<head>
-<title>About</title>
-<style type="text/css">
-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}
-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
-code { font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup { font-family: arial,helvetica,geneva; font-size: 10px}
-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li { font-family: arial, helvetica, geneva; font-size: 10pt}
-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}
-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}
-</style>
-</head>
-<body lang="EN-US" link="blue" vlink="purple">
-<table border="0" cellspacing="5" cellpadding="2" width="100%" >
-  <tr> 
-    <td align="LEFT" valign="TOP" colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF">About This Content</font></b></td>
-  </tr>
-  <tr> 
-    <td> 
-<p>11th December, 2001</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in &quot;Content&quot;.  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> &quot;CPL&quot;.  For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL &quot;Other License&quot;, any modifications, enhancements and/or
-other code and/or documentation &quot;Modifications&quot; uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-</td></tr></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching.macosx/build.properties b/org.eclipse.jdt.launching.macosx/build.properties
deleted file mode 100644
index 7924131..0000000
--- a/org.eclipse.jdt.launching.macosx/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               *.jar
-source.macosxlaunching.jar = macosx/
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java
deleted file mode 100644
index aea255f..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.launching.AbstractVMRunner;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-public abstract class JavaVMRunner extends AbstractVMRunner {
-
-	protected IVMInstall fVMInstance;
-
-	public JavaVMRunner(IVMInstall vmInstance) {
-		fVMInstance= vmInstance;
-	}
-	
-	protected String renderDebugTarget(String classToRun, int host) {
-		String format= MacOSXLauncherMessages.getString("javaVMRunner.format.dbgTarget"); //$NON-NLS-1$
-		return MessageFormat.format(format, new String[] { classToRun, String.valueOf(host) });
-	}
-
-	public static String renderProcessLabel(String[] commandLine) {
-		String format= MacOSXLauncherMessages.getString("javaVMRunner.format.processLabel"); //$NON-NLS-1$
-		String timestamp= DateFormat.getInstance().format(new Date(System.currentTimeMillis()));
-		return MessageFormat.format(format, new String[] { commandLine[0], timestamp });
-	}
-	
-	protected static String renderCommandLine(String[] commandLine) {
-		if (commandLine.length < 1)
-			return ""; //$NON-NLS-1$
-		StringBuffer buf= new StringBuffer(commandLine[0]);
-		for (int i= 1; i < commandLine.length; i++) {
-			buf.append(' ');
-			buf.append(commandLine[i]);
-		}	
-		return buf.toString();
-	}	
-	
-	protected void addArguments(String[] args, List v) {
-		if (args == null)
-			return;
-		for (int i= 0; i < args.length; i++)
-			v.add(args[i]);
-	}
-	
-	protected String getJDKLocation() {
-		File location= fVMInstance.getInstallLocation();
-		return location.getAbsolutePath();
-	}
-	
-	/**
-	 * Returns the working directory to use for the launched VM,
-	 * or <code>null</code> if the working directory is to be inherited
-	 * from the current process.
-	 * 
-	 * @return the working directory to use
-	 * @exception CoreException if the working directory specified by
-	 *  the configuration does not exist or is not a directory
-	 */	
-	protected File getWorkingDir(VMRunnerConfiguration config) throws CoreException {
-		String path = config.getWorkingDirectory();
-		if (path == null) {
-			return null;
-		}
-		File dir = new File(path);
-		if (!dir.isDirectory()) {
-			abort(MessageFormat.format(MacOSXLauncherMessages.getString("JavaVMRunner.Specified_working_directory_does_not_exist_or_is_not_a_directory__{0}_1"), new String[] {path}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); //$NON-NLS-1$
-		}
-		return dir;
-	}	
-	
-	/**
-	 * @see VMRunner#getPluginIdentifier()
-	 */
-	protected String getPluginIdentifier() {
-		return MacOSXLaunchingPlugin.getUniqueIdentifier();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
deleted file mode 100644
index 6486ea5..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.internal.launching.StandardVMDebugger;
-import org.eclipse.jdt.launching.IVMInstall;
-
-public class MacOSXDebugVMRunner extends StandardVMDebugger {
-	
-	public MacOSXDebugVMRunner(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-	
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		
-		String[] cmdLine2= new String[cmdLine.length + 2];
-		
-		String wrapper= MacOSXLaunchingPlugin.createWrapper(getClass(), "start_carbon.sh");
-		
-		int j= 0;
-		cmdLine2[j++]= "/bin/sh";
-		cmdLine2[j++]= wrapper;
-		for (int i= 0; i < cmdLine.length; i++)
-			cmdLine2[j++]= cmdLine[i];
-		
-		return super.exec(cmdLine2, workingDirectory);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java
deleted file mode 100644
index 875b693..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class MacOSXLauncherMessages {
-
-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.launching.macosx.MacOSXLauncherMessages";//$NON-NLS-1$
-
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-	private MacOSXLauncherMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return fgResourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
deleted file mode 100644
index cd7c9d8..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
-# Contributors:
-#    Andre Weinand - Initial implementation
-######################################################################
-
-MacOSXDebugVMRunner.Could_not_find_a_free_socket_for_the_debugger_1=Could not find a free socket for the debugger
-MacOSXDebugVMRunner.Couldn__t_connect_to_VM_5=Could not connect to VM
-MacOSXDebugVMRunner.Couldn__t_find_an_appropriate_debug_connector_2=Could not find an appropriate debug connector
-
-MacOSXVMType.error.notRoot=Not a JDK Root; MacOS X executable was not found
-MacOSXVMType.name=MacOS X VM
-
-javaVMRunner.format.dbgTarget={0} at localhost:{1}
-javaVMRunner.format.processLabel={0} ({1})
-JavaVMRunner.Specified_working_directory_does_not_exist_or_is_not_a_directory__{0}_1=Specified working directory does not exist or is not a directory: {0}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
deleted file mode 100644
index b9436c9..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
deleted file mode 100644
index e2a7614..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.launching.AbstractVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.IVMRunner;
-
-public class MacOSXVMInstall extends AbstractVMInstall {
-
-	/**
-	 * Constructor for MacOSXVM
-	 */
-	MacOSXVMInstall(IVMInstallType type, String id) {
-		super(type, id);
-	}
-
-	/**
-	 * @see IVMInstall#getVMRunner(String)
-	 */
-	public IVMRunner getVMRunner(String mode) {
-		if (ILaunchManager.RUN_MODE.equals(mode))
-			return new MacOSXVMRunner(this);
-		
-		if (ILaunchManager.DEBUG_MODE.equals(mode))
-			return new MacOSXDebugVMRunner(this);
-		
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
deleted file mode 100644
index 032dd4b..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.AbstractVMInstallType;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * This plugins into the org.eclipse.jdt.launching.vmInstallTypes extension point
- */
-public class MacOSXVMInstallType extends AbstractVMInstallType {
-
-	public IVMInstall doCreateVMInstall(String id) {
-		return new MacOSXVMInstall(this, id);
-	}
-	
-	public String getName() {
-		return MacOSXLauncherMessages.getString("MacOSXVMType.name"); //$NON-NLS-1$
-	}
-	
-	public IStatus validateInstallLocation(File installLocation) {
-		File java= new File(installLocation, "bin"+File.separator+"java"); //$NON-NLS-2$ //$NON-NLS-1$
-		if (!java.isFile()) {
-			return new Status(IStatus.ERROR, MacOSXLaunchingPlugin.getUniqueIdentifier(), 0, MacOSXLauncherMessages.getString("MacOSXVMType.error.notRoot"), null); //$NON-NLS-1$
-		}
-		return new Status(IStatus.OK, MacOSXLaunchingPlugin.getUniqueIdentifier(), 0, "ok", null); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see IVMInstallType#detectInstallLocation()
-	 */
-	public File detectInstallLocation() {
-		if (!"Java HotSpot(TM) Client VM".equals(System.getProperty("java.vm.name"))) //$NON-NLS-2$ //$NON-NLS-1$
-			return null;
-			
-		String javaHome= System.getProperty("java.home");	//$NON-NLS-1$
-		if (javaHome != null) {
-			File home = new File(javaHome); 
-			if (home.exists())
-				return home;
-		}
-		return null;
-	}
-
-	/**
-	 * @see IVMInstallType#getDefaultSystemLibraryDescription(File)
-	 */
-	public LibraryLocation[] getDefaultLibraryLocations(File installLocation) {
-		IPath libHome= new Path(installLocation.toString()); //$NON-NLS-1$
-		libHome= libHome.append(".."); //$NON-NLS-1$
-		libHome= libHome.append("Classes"); //$NON-NLS-1$
-		IPath lib= libHome.append("classes.jar"); //$NON-NLS-1$
-		IPath uilib= libHome.append("ui.jar"); //$NON-NLS-1$
-		
-		IPath source= new Path(installLocation.toString());
-		source= source.append("src.jar"); //$NON-NLS-1$
-		
-		IPath srcPkgRoot= new Path("src"); //$NON-NLS-1$
-		
-		return new LibraryLocation[] {
-				new LibraryLocation(lib, source, srcPkgRoot),
-				new LibraryLocation(uilib, source, srcPkgRoot)
-		};
-	}
-
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
deleted file mode 100644
index 417ad7c..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.*;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.internal.launching.StandardVMRunner;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-public class MacOSXVMRunner extends StandardVMRunner {
-	
-	public MacOSXVMRunner(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-
-	protected String constructProgramString(VMRunnerConfiguration config) {
-		String command= null;
-		Map map= config.getVMSpecificAttributesMap();
-		if (map != null) {
-			command = (String)map.get(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND);
-		}
-		StringBuffer buff= new StringBuffer(getJDKLocation());
-		buff.append(File.separator);
-		buff.append("bin"); //$NON-NLS-1$
-		buff.append(File.separator);
-		String jdkLocation= buff.toString();
-		if (command == null) {
-			buff.append("java"); //$NON-NLS-1$
-			return adjustProgramString(buff.toString());
-		} 
-		
-		buff.append(command);
-		String program= buff.toString();
-		File exe= new File(program + ".exe"); //$NON-NLS-1$
-		File javaCommand= new File(program); 
-		
-		if (!exe.isFile() && !javaCommand.isFile()) {
-			File java= new File(jdkLocation + "java.exe"); //$NON-NLS-1$
-			if (java.isFile()) {
-				program= java.getAbsolutePath();
-			} else {
-				java= new File(jdkLocation + "java"); //$NON-NLS-1$
-				if (java.isFile()) {
-					program= java.getAbsolutePath();
-				}
-			}
-		}
-		return program;
-	}	
-	
-	protected boolean shouldIncludeInPath(String path) {
-		return true;
-	}
-	
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		
-		String[] cmdLine2= new String[cmdLine.length + 2];
-		
-		String wrapper= MacOSXLaunchingPlugin.createWrapper(getClass(), "start_carbon.sh");
-		
-		int j= 0;
-		cmdLine2[j++]= "/bin/sh";
-		cmdLine2[j++]= wrapper;
-		for (int i= 0; i < cmdLine.length; i++)
-			cmdLine2[j++]= cmdLine[i];
-		
-		return super.exec(cmdLine2, workingDirectory);
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh
deleted file mode 100644
index 72f1e27..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh
-
-#********************************************************************** 
-# Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-# This file is made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Andre Weinand, OTI - Initial version
-#********************************************************************** 
-
-# 
-# This script wrappers a SWT based Java application on the fly as an
-# application bundle and launches it.
-#
-# Why is it necessary?
-# When using Carbon via JNI some magic is necessary to make MacOS X
-# recognize the Java program as a 'real Mac application' with its own menu bar 
-# and an entry in the Dock. Since this 'magic' does not seem to be public and
-# documented API I don't know how to call it from the SWT startup code.
-# As a workaround I've tried to simulate what ProjectBuilder or MRJAppBuilder
-# do if they launch a SWT based Java application.
-#
-# How is it used?
-# Basically by replacing the standard Java VM ('/usr/bin/java') with this script.
-# Since this script is a replacement for the VM it takes roughly the same arguments.
-
-#
-# In order to build an application bundle under MacOS X we need
-# a small stub that reads the various artefacts of a bundle and
-# starts the Java VM. We copy the stub from the JavaVM framework.
-#
-JAVASTUB="/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/JavaApplicationStub"
-
-#
-# Where to build the temporary application bundle
-#
-TMP_APP_DIR="/tmp/swt_stubs"
-
-#
-# We remember the current working directory
-# so that we can later define the property "WorkingDirectory"
-#
-CURRENT_DIR="$PWD"
-
-#echo $* > /dev/console
-
-VM_OPTIONS=""
-#
-# Ensure that we get our own JDI implementation
-# 
-#JDI="$JAVA_LIBRARY_PATH"/plugins/org.eclipse.jdt.debug/jdi.jar
-#if test -f "$JDI"
-#then
-#	VM_OPTIONS="$VM_OPTIONS<string>-Xbootclasspath/p:$JDI</string>"
-#	echo $VM_OPTIONS > /dev/console
-#else
-#	echo "$JDI not found" > /dev/console
-#fi
-
-# skip 1st argument
-shift
-
-#
-# Process command line arguments until we see the main class...
-#
-while [ $# -gt 0 ]; do
-	case "$1" in
-		-classpath | -cp )
-			CLASS_PATH="$2"
-			shift;
-			;;	
-		-* )
-			VM_OPTIONS="$VM_OPTIONS<string>$1</string>"
-			;;
-		* )
-			MAIN_CLASS="$1"
-			shift;
-			break;
-			;;
-	esac
-	shift
-done
-
-while [ $# -gt 0 ]; do
-	PARAMETERS="$PARAMETERS<string>$1</string>"
-	shift
-done
-
-#
-# Application name is name of main class without package prefix 
-#
-APP_NAME=`echo $MAIN_CLASS | awk -F. '{ print $(NF) }' `
-LAUNCHER="$APP_NAME"
-
-#
-# Create the parent directory for the application bundle 
-#
-mkdir -p $TMP_APP_DIR
-cd $TMP_APP_DIR
-
-#
-# Create the application bundle 
-#
-rm -rf $APP_NAME.app
-mkdir -p $APP_NAME.app/Contents/MacOS
-
-cd $APP_NAME.app/Contents
-
-#
-# Copy the JavaAppLauncher into the bundle 
-#
-cp $JAVASTUB MacOS/$APP_NAME
-
-#
-# Create the Info.plist file.
-#
-cat > Info.plist <<End_Of_Input
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-	<key>CFBundleGetInfoString</key>
-		<string>$APP_NAME</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-	<key>CFBundleName</key>
-		<string>$APP_NAME</string>
-	<key>CFBundlePackageType</key>
-		<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-		<string>2.0.1</string>
-	<key>CFBundleSignature</key>
-		<string>????</string>
-	<key>CFBundleVersion</key>
-		<string>1.0.1</string>
-	<key>Java</key>
-	<dict>
-		<key>VMOptions</key>
-			<array>$VM_OPTIONS</array>
-		<key>ClassPath</key>
-			<string>$CLASS_PATH</string>
-		<key>MainClass</key>
-			<string>$MAIN_CLASS</string>
-		<key>WorkingDirectory</key>
-			<string>$CURRENT_DIR</string>
-		<key>Arguments</key>
-			<array>$PARAMETERS</array>
-	</dict>
-</dict>
-</plist>
-End_Of_Input
-
-#
-# Start the JavaAppLauncher by replacing this shell script
-# to ensure that the process id is preserved.
-#
-exec $TMP_APP_DIR/$APP_NAME.app/Contents/MacOS/$APP_NAME
-
-#
-# not reached (as long as the exec from above succeeds).
-#
diff --git a/org.eclipse.jdt.launching.macosx/plugin.properties b/org.eclipse.jdt.launching.macosx/plugin.properties
deleted file mode 100644
index a94d903..0000000
--- a/org.eclipse.jdt.launching.macosx/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
-# Contributors:
-#    IBM Corporation - Initial implementation
-######################################################################
-
-pluginName = Mac OS X Launcher
-providerName=Eclipse.org
diff --git a/org.eclipse.jdt.launching.macosx/plugin.xml b/org.eclipse.jdt.launching.macosx/plugin.xml
deleted file mode 100644
index e6511cc..0000000
--- a/org.eclipse.jdt.launching.macosx/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- File written by PDE 1.0 -->
-<plugin
-   id="org.eclipse.jdt.launching.macosx"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.internal.launching.macosx.MacOSXLaunchingPlugin">
-
-<!-- Required plugins -->
-
-<requires>
-   <import plugin="org.eclipse.jdt.debug"/>
-   <import plugin="org.eclipse.debug.core"/>
-   <import plugin="org.eclipse.core.resources"/>
-   <import plugin="org.eclipse.jdt.core"/>
-   <import plugin="org.eclipse.jdt.launching"/>
-</requires>
-
-<!-- Runtime -->
-
-<runtime>
-   <library name="macosxlaunching.jar"/>
-</runtime>
-
-<!-- Extension points -->
-
-<!-- Extensions -->
-
-<extension point="org.eclipse.jdt.launching.vmInstallTypes">
-	<vmInstallType
-		id="org.eclipse.jdt.internal.launching.macosx.MacOSXType"
-		class="org.eclipse.jdt.internal.launching.macosx.MacOSXVMInstallType"
-	/>
-</extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml b/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
deleted file mode 100644
index 5226037..0000000
--- a/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- build script to create a plugin from org.eclipse.jdt.launching.macosx -->
-
-<project name="org.eclipse.jdt.launching.macosx" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.launching.macosx_2.1.0" />
-		<property name="dest"  value="${destdir}/${plugin}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/macosxlaunching.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<zip zipfile="${dest}/macosxlaunchingsrc.zip">
-		    <fileset dir="macosx" />
-  		</zip>		
-	</target>
-</project>