You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by iv...@apache.org on 2007/07/03 06:10:44 UTC
svn commit: r552660 - in
/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario:
BR02/ BR03/ EV01/ EV02/ EV03/ LV01/ LV02/ LV03/ OV01/ OV02/ OV03/ PF01/
ST01/ ST03/ ST05/ ST06/ ST07...
Author: ivavladimir
Date: Mon Jul 2 21:10:42 2007
New Revision: 552660
URL: http://svn.apache.org/viewvc?view=rev&rev=552660
Log:
patch for issue 4306 '[buildtest][func] some jdwp tests are invalid due to source updates' was applied
Modified:
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR02/BR02Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR03/BR03Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV01/EV01Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV02/EV02Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV03/EV03Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV01/LV01Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV02/LV02Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV03/LV03Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV01/OV01Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV02/OV02Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV03/OV03Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/PF01/PF01Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST01/ST01Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST03/ST03Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST05/ST05Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST06/ST06Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST07/ST07Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD01/TD01Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD02/TD02Test.java
harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD03/TD03Test.java
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR02/BR02Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR02/BR02Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR02/BR02Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR02/BR02Test.java Mon Jul 2 21:10:42 2007
@@ -47,7 +47,7 @@
EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE);
String method = "run";
- int breakpointLine = 39; //
+ int breakpointLine = 52; //
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR03/BR03Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR03/BR03Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR03/BR03Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/BR03/BR03Test.java Mon Jul 2 21:10:42 2007
@@ -85,7 +85,7 @@
logWriter.println("Setting a breakpoint at a line with a first call to 'println' in a run method.");
method = "run";
methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- breakpointLine = 39; //
+ breakpointLine = 52; //
breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine));
reply = debuggeeWrapper.vmMirror.setBreakpoint(JDWPConstants.TypeTag.CLASS, breakpoint);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV01/EV01Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV01/EV01Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV01/EV01Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV01/EV01Test.java Mon Jul 2 21:10:42 2007
@@ -52,7 +52,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 39; // a line with first call to 'ptintln'
+ int breakpointLine = 52; // a line with first call to 'ptintln'
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV02/EV02Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV02/EV02Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV02/EV02Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV02/EV02Test.java Mon Jul 2 21:10:42 2007
@@ -49,7 +49,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 39; // a line with first call to 'ptintln'
+ int breakpointLine = 52; // a line with first call to 'ptintln'
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV03/EV03Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV03/EV03Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV03/EV03Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/EV03/EV03Test.java Mon Jul 2 21:10:42 2007
@@ -50,7 +50,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 39; // a line with first call to 'ptintln'
+ int breakpointLine = 52; // a line with first call to 'ptintln'
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV01/LV01Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV01/LV01Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV01/LV01Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV01/LV01Test.java Mon Jul 2 21:10:42 2007
@@ -53,7 +53,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 42; // after all local vars are printed
+ int breakpointLine = 55; // after all local vars are printed
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV02/LV02Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV02/LV02Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV02/LV02Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV02/LV02Test.java Mon Jul 2 21:10:42 2007
@@ -74,7 +74,7 @@
long start = reply.getNextValueAsLong();
int firstLineNumber = debuggeeWrapper.vmMirror.getLineNumber(debuggeeClassId, methodId, start);
- int breakpointLine = 48; // after worker tread was started
+ int breakpointLine = 61; // after worker tread was started
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
@@ -198,6 +198,9 @@
if (frameVarsNames != null) {
return failed("Couldn't get variables of frame '" + frameNames[j] + "'");
}
+ continue;
+ } else if (frameVarsNames == null) {
+ // ignore unknown variables
continue;
}
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV03/LV03Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV03/LV03Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV03/LV03Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/LV03/LV03Test.java Mon Jul 2 21:10:42 2007
@@ -73,7 +73,7 @@
long start = reply.getNextValueAsLong();
int firstLineNumber = debuggeeWrapper.vmMirror.getLineNumber(debuggeeClassId, methodId, start);
- int breakpointLine = 48; // just before notification of thread
+ int breakpointLine = 61; // just before notification of thread
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
@@ -190,6 +190,9 @@
if (frameVarsTypes != null ) {
return failed("Couldn't get variables of frame '" + frameNames[j] + "'");
}
+ continue;
+ } else if (frameVarsTypes == null) {
+ // ignore unknown variables
continue;
}
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV01/OV01Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV01/OV01Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV01/OV01Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV01/OV01Test.java Mon Jul 2 21:10:42 2007
@@ -54,7 +54,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 47; // before running a new thread
+ int breakpointLine = 60; // before running a new thread
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV02/OV02Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV02/OV02Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV02/OV02Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV02/OV02Test.java Mon Jul 2 21:10:42 2007
@@ -53,7 +53,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 47; // before running a new thread
+ int breakpointLine = 60; // before running a new thread
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV03/OV03Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV03/OV03Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV03/OV03Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/OV03/OV03Test.java Mon Jul 2 21:10:42 2007
@@ -52,7 +52,7 @@
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
- int breakpointLine = 47; // before running a new thread
+ int breakpointLine = 60; // before running a new thread
long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine);
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/PF01/PF01Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/PF01/PF01Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/PF01/PF01Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/PF01/PF01Test.java Mon Jul 2 21:10:42 2007
@@ -52,7 +52,7 @@
long debuggeeClassID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, method);
- int breakpointLine = 40;
+ int breakpointLine = 53;
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassID, methodID, breakpointLine));
reply = debuggeeWrapper.vmMirror.setBreakpoint(JDWPConstants.TypeTag.CLASS, breakpoint);
if (reply.getErrorCode() != JDWPConstants.Error.NONE) {
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST01/ST01Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST01/ST01Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST01/ST01Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST01/ST01Test.java Mon Jul 2 21:10:42 2007
@@ -51,7 +51,7 @@
reply = debuggeeWrapper.vmMirror.getLineTable(debuggeeClassId, methodId);
long start = reply.getNextValueAsLong();
- int runBreakpointLine = 31;
+ int runBreakpointLine = 44;
Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, runBreakpointLine));
@@ -84,7 +84,7 @@
return failed("Couldn't obtain line table information of the method '" + method + "'");
}
long startLineIndex = reply.getNextValueAsLong();
- int checkedMethodBreakpointLine = 40;
+ int checkedMethodBreakpointLine = 53;
int breakpointLine = debuggeeWrapper.vmMirror.getLineNumber(debuggeeClassId, methodId, startLineIndex);
int stepsToEnterMethod = 10;
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST03/ST03Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST03/ST03Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST03/ST03Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST03/ST03Test.java Mon Jul 2 21:10:42 2007
@@ -113,7 +113,7 @@
int checkedLine = debuggeeWrapper.vmMirror.getLineNumber(debuggeeClassId, methodId, startLineIndex);
int previousLine = stoppedLine;
- int lineAfterMethodInvocation = 40; // line after 'stepMethod' call
+ int lineAfterMethodInvocation = 53; // line after 'stepMethod' call
String threadName = debuggeeWrapper.vmMirror.getThreadName(threadID);
logWriter.print("Set several steps by a bytecode instruction and check method '" + method + "' invocation");
while (stoppedLine != lineAfterMethodInvocation) {
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST05/ST05Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST05/ST05Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST05/ST05Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST05/ST05Test.java Mon Jul 2 21:10:42 2007
@@ -83,7 +83,7 @@
debuggeeWrapper.vmMirror.clearEvent(JDWPConstants.EventKind.SINGLE_STEP, reply.getNextValueAsInt());
logWriter.print("Checking whether an application returned from the method '" + method + "'");
- int checkedLine = 40;
+ int checkedLine = 53;
String checkedMethod = "run";
events = ParsedEvent.parseEventPacket(event);
location = ((ParsedEvent.Event_SINGLE_STEP)events[0]).getLocation();
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST06/ST06Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST06/ST06Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST06/ST06Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST06/ST06Test.java Mon Jul 2 21:10:42 2007
@@ -38,6 +38,7 @@
"java.*",
"sun.*",
"org.apache.harmony.nio.*",
+ "org.apache.harmony.niochar.*",
"org.apache.harmony.misc.*",
"org.apache.harmony.net.*",
"org.apache.harmony.vmaccess.*",
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST07/ST07Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST07/ST07Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST07/ST07Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/ST07/ST07Test.java Mon Jul 2 21:10:42 2007
@@ -37,6 +37,7 @@
"org.apache.harmony.share.*",
"jrockit.*",
"org.apache.harmony.nio.*",
+ "org.apache.harmony.niochar.*",
"org.apache.harmony.misc.*",
"org.apache.harmony.net.*",
"org.apache.harmony.vmaccess.*",
@@ -53,8 +54,8 @@
private final static String BREAKPOINT_CLASS_SIG = "L" + BREAKPOINT_CLASS_NAME.replace('.', '/') + ";";
private String breakpointMethod = "testMethod";
- private int breakpointLine = 37;
- private int breakpointLineInRunMethod = 21;
+ private int breakpointLine = 50;
+ private int breakpointLineInRunMethod = 34;
@@ -553,7 +554,7 @@
logWriter.println("Breakpoint is set at the class '" + BREAKPOINT_CLASS_NAME + "', method '" + breakpointMethod + "', line " + breakpointLine);
logWriter.println("Set second breakpoint inside " + breakpointMethod);
- breakpointLine = 39;
+ breakpointLine = 52;
breakpointClassID = debuggeeWrapper.vmMirror.getClassID(BREAKPOINT_CLASS_SIG);
breakpointMethodID = debuggeeWrapper.vmMirror.getMethodID(breakpointClassID, breakpointMethod);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD01/TD01Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD01/TD01Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD01/TD01Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD01/TD01Test.java Mon Jul 2 21:10:42 2007
@@ -45,7 +45,7 @@
EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE);
String method = "run";
- int breakpointLine = 39; //
+ int breakpointLine = 52; //
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD02/TD02Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD02/TD02Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD02/TD02Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD02/TD02Test.java Mon Jul 2 21:10:42 2007
@@ -60,7 +60,7 @@
EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE);
String method = "run";
- int breakpointLine = 39; //
+ int breakpointLine = 52; //
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);
Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD03/TD03Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD03/TD03Test.java?view=diff&rev=552660&r1=552659&r2=552660
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD03/TD03Test.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jpda/jdwp/scenario/TD03/TD03Test.java Mon Jul 2 21:10:42 2007
@@ -59,7 +59,7 @@
EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE);
String method = "run";
- int breakpointLine = 39; //
+ int breakpointLine = 52; //
long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG);
long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);