You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/10/21 10:29:59 UTC
svn commit: r827952 [5/7] - in
/incubator/kato/branches/experimental/thirdview/org.apache.kato:
kato.api/src/main/java/javax/tools/diagnostics/
kato.api/src/main/java/javax/tools/diagnostics/image/
kato.api/src/main/java/javax/tools/diagnostics/runtime...
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java Wed Oct 21 10:29:55 2009
@@ -20,12 +20,12 @@
import javax.tools.diagnostics.image.CorruptData;
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -70,16 +70,16 @@
this.id = generatePrefix(waiters, enters, owners);
}
- void setMonitor(JavaMonitor monitor) {
+ void setMonitor(JVMMonitor monitor) {
this.monitor = monitor;
}
- JavaMonitor getMonitor() {
+ JVMMonitor getMonitor() {
return monitor;
}
String id;
int waiters, enters, owners;
- private JavaMonitor monitor;
+ private JVMMonitor monitor;
}
@@ -138,7 +138,7 @@
for (int i = 0; i < monitorConfigs.length; i++) {
System.out.println("Printing out status of "+ monitorConfigs[i].id);
System.out.println("==================================");
- JavaMonitor monitor = monitorConfigs[i].getMonitor();
+ JVMMonitor monitor = monitorConfigs[i].getMonitor();
if (monitor == null) {
System.out.println("monitor = null");
@@ -165,7 +165,7 @@
continue;
}
- JavaThread thread = (JavaThread) next;
+ JVMThread thread = (JVMThread) next;
try {
System.out.println("EnterWaiter: "+thread.getName());
@@ -190,7 +190,7 @@
continue;
}
- JavaThread thread = (JavaThread) next;
+ JVMThread thread = (JVMThread) next;
try {
System.out.println("NotifyWaiter: "+thread.getName());
@@ -201,7 +201,7 @@
}
}
- JavaThread thread;
+ JVMThread thread;
try {
thread = monitor.getOwner();
if (thread == null) {
@@ -418,10 +418,10 @@
}
}
- static private JavaRuntime runtime;
+ static private JVMRuntime runtime;
public void setUp() throws Exception {
- JavaRuntime currentRuntime = getJavaRuntime();
+ JVMRuntime currentRuntime = getJavaRuntime();
if (runtime != null && currentRuntime.equals(runtime)) {
return;
@@ -433,7 +433,7 @@
}
public void findMonitors() throws Exception {
- JavaRuntime runtime = getJavaRuntime();
+ JVMRuntime runtime = getJavaRuntime();
Iterator monitorIterator = runtime.getMonitors().iterator();
@@ -446,13 +446,13 @@
continue;
}
- JavaMonitor monitorCandidate = (JavaMonitor) next;
+ JVMMonitor monitorCandidate = (JVMMonitor) next;
//System.out.println("Monitor candidate->"+monitorCandidate.getName());
- JavaObject monitorObjectCandidate = monitorCandidate.getObject();
+ JVMObject monitorObjectCandidate = monitorCandidate.getObject();
if (monitorObjectCandidate != null) {
- JavaClass monitorClass = monitorObjectCandidate.getJavaClass();
+ JVMClass monitorClass = monitorObjectCandidate.getJavaClass();
if (!monitorClassName.equals(monitorClass.getName())) {
continue;
}
@@ -466,7 +466,7 @@
continue;
}
- JavaField field = (JavaField) next2;
+ JVMField field = (JVMField) next2;
String id = null;
if ("id".equals(field.getName())) {
@@ -487,25 +487,25 @@
}
public void testFindMonitor_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
assertNotNull("Couldn't find 0-1-1", monitor);
}
public void testGetID_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 0-1-1 is null.", monitor.getID());
}
public void testGetName_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 0-1-1 is null.", monitor
.getName());
}
public void testCountWaiters_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -518,7 +518,7 @@
}
public void testCountEnters_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -531,19 +531,19 @@
}
public void testCountOwners_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(0, 1, 1)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -554,12 +554,12 @@
}
public void testNameEnters_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
- JavaThread next = (JavaThread) enters.next();
+ JVMThread next = (JVMThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(0, 1, 1) + "-"
+ monitorEnterThreadName + "-" + count, next.getName());
count++;
@@ -567,8 +567,8 @@
}
public void testNameOwners_0_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(0, 1, 1) + "-"
+ monitorOwnerThreadName + "-0", owner.getName());
@@ -577,25 +577,25 @@
///////////////////////////////////////////
public void testFindMonitor_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
assertNotNull("Couldn't find 0-1-1", monitor);
}
public void testGetID_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 0-1-1 is null.", monitor.getID());
}
public void testGetName_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 0-1-1 is null.", monitor
.getName());
}
public void testCountWaiters_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -608,7 +608,7 @@
}
public void testCountEnters_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -621,19 +621,19 @@
}
public void testCountOwners_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(0, 0, 1)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -643,12 +643,12 @@
}
public void testNameEnters_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
- JavaThread next = (JavaThread) enters.next();
+ JVMThread next = (JVMThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(0, 0, 1) + "-"
+ monitorEnterThreadName + "-" + count, next.getName());
count++;
@@ -656,8 +656,8 @@
}
public void testNameOwners_0_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(0, 0, 1) + "-"
+ monitorOwnerThreadName + "-0", owner.getName());
@@ -666,25 +666,25 @@
///////////////////////////////////////////
public void testFindMonitor_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
assertNotNull("Couldn't find monitor 1-0-0", monitor);
}
public void testGetID_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getID() for 1-0-0 is null.", monitor.getID());
}
public void testGetName_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getName() for 1-0-0 is null.", monitor
.getName());
}
public void testCountWaiters_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -697,7 +697,7 @@
}
public void testCountEnters_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -710,19 +710,19 @@
}
public void testCountOwners_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNull("Owner count incorrect", owner);
}
public void testNameWaiters_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(1, 0, 0)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -731,12 +731,12 @@
}
public void testNameEnters_1_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
- JavaThread next = (JavaThread) enters.next();
+ JVMThread next = (JVMThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(1, 0, 0) + "-"
+ monitorEnterThreadName + "-" + count, next.getName());
count++;
@@ -746,25 +746,25 @@
///////////////////////////////////////////
public void testFindMonitor_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
assertNotNull("Couldn't find monitor 1-1-1", monitor);
}
public void testGetID_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 1-1-1 is null.", monitor.getID());
}
public void testGetName_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 1-1-1 is null.", monitor
.getName());
}
public void testCountWaiters_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -777,7 +777,7 @@
}
public void testCountEnters_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
enters = monitor.getEnterWaiters().iterator();
@@ -791,14 +791,14 @@
}
public void testCountOwners_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -807,7 +807,7 @@
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(1, 1, 1)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -816,12 +816,12 @@
}
public void testNameEnters_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
- JavaThread next = (JavaThread) enters.next();
+ JVMThread next = (JVMThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(1, 1, 1) + "-"
+ monitorEnterThreadName + "-" + count, next.getName());
count++;
@@ -829,8 +829,8 @@
}
public void testNameOwners_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(1, 1, 1) + "-"
+ monitorOwnerThreadName + "-0", owner.getName());
@@ -839,25 +839,25 @@
//////////////////////////////////////////////
public void testFindMonitor_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
assertNotNull("Couldn't find monitor 2-0-0", monitor);
}
public void testGetID_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getID() for 2-0-0 is null.", monitor.getID());
}
public void testGetName_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getName() for 2-0-0 is null.", monitor
.getName());
}
public void testCountWaiters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -870,7 +870,7 @@
}
public void testCountEnters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -883,19 +883,19 @@
}
public void testCountOwners_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNull("Owner count incorrect", owner);
}
public void testNameWaiters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(2, 0, 0)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -904,12 +904,12 @@
}
public void testNameEnters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
- JavaThread next = (JavaThread) enters.next();
+ JVMThread next = (JVMThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(2, 0, 0) + "-"
+ monitorEnterThreadName + "-" + count, next.getName());
count++;
@@ -918,25 +918,25 @@
///////////////////////////////////////////
public void testFindMonitor_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
assertNotNull("Couldn't find monitor 1-0-1", monitor);
}
public void testGetID_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 1-0-1 is null.", monitor.getID());
}
public void testGetName_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 1-0-1 is null.", monitor
.getName());
}
public void testCountWaiters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -949,7 +949,7 @@
}
public void testCountEnters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -962,19 +962,19 @@
}
public void testCountOwners_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(1, 0, 1)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -983,12 +983,12 @@
}
public void testNameEnters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
- JavaThread next = (JavaThread) enters.next();
+ JVMThread next = (JVMThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(1, 0, 1) + "-"
+ monitorEnterThreadName + "-" + count, next.getName());
count++;
@@ -996,8 +996,8 @@
}
public void testNameOwners_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(1, 0, 1) + "-"
+ monitorOwnerThreadName + "-0", owner.getName());
@@ -1005,25 +1005,25 @@
///////////////////////////////////////////
public void testFindMonitor_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
assertNotNull("Couldn't find monitor 0-2-1", monitor);
}
public void testGetID_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 0-2-1 is null.", monitor.getID());
}
public void testGetName_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 0-2-1 is null.", monitor
.getName());
}
public void testCountWaiters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -1036,7 +1036,7 @@
}
public void testCountEnters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -1049,19 +1049,19 @@
}
public void testCountOwners_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
- JavaThread next = (JavaThread) waiters.next();
+ JVMThread next = (JVMThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(0, 2, 1)
+ "-" + monitorNotifyThreadName + "-" + count, next
.getName());
@@ -1070,7 +1070,7 @@
}
public void testNameEnters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
Iterator enters = monitor.getEnterWaiters().iterator();
String error = checkNames(enters, generatePrefix(0, 2, 1) + "-"
@@ -1080,8 +1080,8 @@
}
public void testNameOwners_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(0, 2, 1) + "-"
+ monitorOwnerThreadName + "-0", owner.getName());
@@ -1090,25 +1090,25 @@
///////////////////////////////////////////
public void testFindMonitor_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
assertNotNull("Couldn't find monitor 2-2-1", monitor);
}
public void testGetID_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 2-2-1 is null.", monitor.getID());
}
public void testGetName_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 2-2-1 is null.", monitor
.getName());
}
public void testCountWaiters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -1121,7 +1121,7 @@
}
public void testCountEnters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -1134,14 +1134,14 @@
}
public void testCountOwners_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
Iterator waiters = monitor.getNotifyWaiters().iterator();
String error = checkNames(waiters, generatePrefix(2, 2, 1)
@@ -1150,7 +1150,7 @@
}
public void testNameEnters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
Iterator enters = monitor.getEnterWaiters().iterator();
String error = checkNames(enters, generatePrefix(2, 2, 1) + "-"
@@ -1160,8 +1160,8 @@
}
public void testNameOwners_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
- JavaThread owner = monitor.getOwner();
+ JVMMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JVMThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(2, 2, 1) + "-"
+ monitorOwnerThreadName + "-0", owner.getName());
@@ -1199,11 +1199,11 @@
public void testGetObject() throws Exception {
for (int i=0; i < NUM_MONITORS; i++){
- JavaObject object = monitorConfigs[i].monitor.getObject();
+ JVMObject object = monitorConfigs[i].monitor.getObject();
assertEquals("Monitor object class unexpected name.",monitorClassName, object.getJavaClass().getName());
- JavaField idField = getJavaField(object, "id");
+ JVMField idField = getJavaField(object, "id");
String idString = idField.getString(object);
assertEquals("MonitorClass id strings didn't match.", monitorConfigs[i].id, idString);
@@ -1240,8 +1240,8 @@
while (waiters.hasNext()) {
Object next = waiters.next();
- if (next instanceof JavaThread) {
- JavaThread thread = (JavaThread) next;
+ if (next instanceof JVMThread) {
+ JVMThread thread = (JVMThread) next;
foundSet.add(thread.getName());
}
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java Wed Oct 21 10:29:55 2009
@@ -17,12 +17,12 @@
import java.util.Iterator;
import javax.tools.diagnostics.image.CorruptData;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -93,13 +93,13 @@
static final String TestArraysClassName = TestArrays.class.getName().replace('.', '/');
- static JavaObject booleanDumpArray, byteDumpArray, shortDumpArray,
+ static JVMObject booleanDumpArray, byteDumpArray, shortDumpArray,
charDumpArray, intDumpArray, longDumpArray,
floatDumpArray, doubleDumpArray, integerDumpArray,
nonDumpArray, arrayDumpArray;
- static JavaField valueField = null;
- static JavaRuntime staticRuntime = null;
+ static JVMField valueField = null;
+ static JVMRuntime staticRuntime = null;
/**
* Setups if the test classe's statics.
@@ -111,16 +111,16 @@
* have run.
*/
protected void setUp() throws Exception {
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
// return if JavaRuntime changes. This is unsafe and bad.
if (runtime.equals(staticRuntime)) {
return;
}
staticRuntime = runtime;
- JavaObject theJavaObject=null;
+ JVMObject theJavaObject=null;
Iterator heaps = runtime.getHeaps().iterator();
- JavaClass theJavaClass = null;
+ JVMClass theJavaClass = null;
while (heaps.hasNext()) {
Object nextHeap = heaps.next();
@@ -129,7 +129,7 @@
break;
}
- JavaHeap aJavaHeap = (JavaHeap) nextHeap;
+ JVMHeap aJavaHeap = (JVMHeap) nextHeap;
Iterator objects = aJavaHeap.getObjects().iterator();
while (objects.hasNext()) {
@@ -139,7 +139,7 @@
break;
}
- JavaObject aJavaObject = (JavaObject) nextObject;
+ JVMObject aJavaObject = (JVMObject) nextObject;
theJavaClass = aJavaObject.getJavaClass();
String theClassName = (theJavaClass).getName();
if (theClassName.equals(TestArraysClassName)){
@@ -167,38 +167,38 @@
break;
}
- JavaField theField = (JavaField) nextField;
+ JVMField theField = (JVMField) nextField;
String theFieldName = theField.getName();
if(theFieldName.equals("booleanArray")) {
- booleanDumpArray = (JavaObject) theField.get(theJavaObject);
+ booleanDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("byteArray")) {
- byteDumpArray = (JavaObject) theField.get(theJavaObject);
+ byteDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("shortArray")) {
- shortDumpArray = (JavaObject) theField.get(theJavaObject);
+ shortDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("charArray")) {
- charDumpArray = (JavaObject) theField.get(theJavaObject);
+ charDumpArray = (JVMObject) theField.get(theJavaObject);
}else if(theFieldName.equals("intArray")) {
- intDumpArray = (JavaObject) theField.get(theJavaObject);
+ intDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("longArray")) {
- longDumpArray = (JavaObject) theField.get(theJavaObject);
+ longDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("floatArray")) {
- floatDumpArray = (JavaObject) theField.get(theJavaObject);
+ floatDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("doubleArray")) {
- doubleDumpArray = (JavaObject) theField.get(theJavaObject);
+ doubleDumpArray = (JVMObject) theField.get(theJavaObject);
} else if(theFieldName.equals("integerArray")) {
- integerDumpArray = (JavaObject) theField.get(theJavaObject);
+ integerDumpArray = (JVMObject) theField.get(theJavaObject);
} else if (theFieldName.equals("nonArray")) {
- nonDumpArray = (JavaObject) theField.get(theJavaObject);
+ nonDumpArray = (JVMObject) theField.get(theJavaObject);
} else if (theFieldName.equals("arrayArray")) {
- arrayDumpArray = (JavaObject) theField.get(theJavaObject);
+ arrayDumpArray = (JVMObject) theField.get(theJavaObject);
}
}
// Find the JavaField "value" in "java/lang/Integer"
Iterator classLoaders = getJavaRuntime().getJavaClassLoaders().iterator();
- JavaClass integerClass = null;
+ JVMClass integerClass = null;
CLASSLOADERS:
while (classLoaders.hasNext()) {
@@ -208,7 +208,7 @@
throw new Exception("CorruptData found instead of JavaClassLoader");
}
- JavaClassLoader loader = (JavaClassLoader) next;
+ JVMClassLoader loader = (JVMClassLoader) next;
Iterator classes = loader.getDefinedClasses().iterator();
@@ -219,7 +219,7 @@
throw new Exception("CorruptData found instead of JavaClass java.lang.Integer");
}
- JavaClass aClass = (JavaClass) next2;
+ JVMClass aClass = (JVMClass) next2;
if (aClass.getName().equals("java/lang/Integer")) {
integerClass = aClass;
@@ -242,7 +242,7 @@
throw new Exception("CorruptData found instead of JavaField in java.lang.Integer");
}
- JavaField aField = (JavaField) next;
+ JVMField aField = (JVMField) next;
if (aField.getName().equals("value")) {
valueField = aField;
@@ -1191,7 +1191,7 @@
* @return true if arrays are equivalent
* @throws Exception
*/
- public boolean compareIntegerArrays(JavaObject[] dump, Integer[] real) throws Exception {
+ public boolean compareIntegerArrays(JVMObject[] dump, Integer[] real) throws Exception {
if ((real == null) & (dump == null)) {
return true;
@@ -1246,13 +1246,13 @@
}
public void testInteger_arraycopy_simplecopy() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
integerDumpArray.arraycopy(0, array, 0, testArraysElementCount);
assertTrue("integerArray did not match.",compareIntegerArrays(array, theTestObject.integerArray));
}
public void testInteger_arraycopy_lengthPlusOne() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
// copying too many elements...
try {
integerDumpArray.arraycopy(0, array, 0, testArraysElementCount+1);
@@ -1263,7 +1263,7 @@
}
public void testInteger_arraycopy_srcPlusOne() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
try {
integerDumpArray.arraycopy(1, array, 0, testArraysElementCount);
fail("integerArray length src+1 copy failed.");
@@ -1273,7 +1273,7 @@
}
public void testInteger_arraycopy_dstPlusOne() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
try {
integerDumpArray.arraycopy(0, array, 1, testArraysElementCount);
fail("integerArray length dst+1 copy failed.");
@@ -1284,7 +1284,7 @@
public void testInteger_arraycopy_removeFirstElement() throws Exception {
// remove first element
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
Integer[] array2 = new Integer[testArraysElementCount];
integerDumpArray.arraycopy(1, array, 1, testArraysElementCount-1);
System.arraycopy(theTestObject.integerArray, 1, array2, 1, testArraysElementCount-1);
@@ -1292,7 +1292,7 @@
}
public void testInteger_arraycopy_removeLastElement() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
Integer[] array2 = new Integer[testArraysElementCount];
integerDumpArray.arraycopy(0, array, 0, testArraysElementCount-1);
System.arraycopy(theTestObject.integerArray, 0, array2, 0, testArraysElementCount-1);
@@ -1301,7 +1301,7 @@
public void testInteger_arraycopy_shiftLeft() throws Exception {
// Shift left by one element
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
Integer[] array2 = new Integer[testArraysElementCount];
integerDumpArray.arraycopy(1, array, 0, testArraysElementCount-1);
System.arraycopy(theTestObject.integerArray, 1, array2, 0, testArraysElementCount-1);
@@ -1310,7 +1310,7 @@
public void testInteger_arraycopy_shiftRight() throws Exception {
// Shift right by one element
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
Integer[] array2 = new Integer[testArraysElementCount];
integerDumpArray.arraycopy(0, array, 1, testArraysElementCount-1);
System.arraycopy(theTestObject.integerArray, 0, array2, 1, testArraysElementCount-1);
@@ -1328,7 +1328,7 @@
public void testArray_getArraySize() throws Exception {
assertEquals("arrayArray is wrong size -> "+arrayDumpArray.getArraySize(), arrayDumpArray.getArraySize(), testArraysElementCount);
}
- public boolean compareShortArrayArrays(JavaObject[] dump, short[][] real) throws Exception {
+ public boolean compareShortArrayArrays(JVMObject[] dump, short[][] real) throws Exception {
if ((real == null) & (dump == null)) {
return true;
@@ -1344,7 +1344,7 @@
// Step through both arrays, compare value in each.
for (int i =0; i < testArraysElementCount; i++) {
- JavaObject array = dump[i];
+ JVMObject array = dump[i];
short[] shortArray = new short[testArraysElementCount];
@@ -1388,13 +1388,13 @@
}
public void testArray_arraycopy_simplecopy() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
arrayDumpArray.arraycopy(0, array, 0, testArraysElementCount);
assertTrue("arrayArray did not match.",compareShortArrayArrays(array, theTestObject.arrayArray));
}
public void testArray_arraycopy_lengthPlusOne() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
// copying too many elements...
try {
arrayDumpArray.arraycopy(0, array, 0, testArraysElementCount+1);
@@ -1405,7 +1405,7 @@
}
public void testArray_arraycopy_srcPlusOne() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
try {
arrayDumpArray.arraycopy(1, array, 0, testArraysElementCount);
fail("arrayArray length src+1 copy failed.");
@@ -1415,7 +1415,7 @@
}
public void testArray_arraycopy_dstPlusOne() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
try {
arrayDumpArray.arraycopy(0, array, 1, testArraysElementCount);
fail("arrayArray length dst+1 copy failed.");
@@ -1426,7 +1426,7 @@
public void testArray_arraycopy_removeFirstElement() throws Exception {
// remove first element
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
short[][] array2 = new short[testArraysElementCount][];
arrayDumpArray.arraycopy(1, array, 1, testArraysElementCount-1);
System.arraycopy(theTestObject.arrayArray, 1, array2, 1, testArraysElementCount-1);
@@ -1434,7 +1434,7 @@
}
public void testArray_arraycopy_removeLastElement() throws Exception {
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
short[][] array2 = new short[testArraysElementCount][];
arrayDumpArray.arraycopy(0, array, 0, testArraysElementCount-1);
@@ -1444,7 +1444,7 @@
public void testArray_arraycopy_shiftLeft() throws Exception {
// Shift left by one element
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
short[][] array2 = new short[testArraysElementCount][];
arrayDumpArray.arraycopy(1, array, 0, testArraysElementCount-1);
System.arraycopy(theTestObject.arrayArray, 1, array2, 0, testArraysElementCount-1);
@@ -1453,7 +1453,7 @@
public void testArray_arraycopy_shiftRight() throws Exception {
// Shift right by one element
- JavaObject[] array = new JavaObject[testArraysElementCount];
+ JVMObject[] array = new JVMObject[testArraysElementCount];
short[][] array2 = new short[testArraysElementCount][];
arrayDumpArray.arraycopy(0, array, 1, testArraysElementCount-1);
System.arraycopy(theTestObject.arrayArray, 0, array2, 1, testArraysElementCount-1);
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java Wed Oct 21 10:29:55 2009
@@ -17,11 +17,11 @@
import javax.tools.diagnostics.image.CorruptData;
import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -50,7 +50,7 @@
{
boolean foundObject = false;
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
Iterator heaps = runtime.getHeaps().iterator();
@@ -61,7 +61,7 @@
break;
}
- JavaHeap aJavaHeap = (JavaHeap) nextHeap;
+ JVMHeap aJavaHeap = (JVMHeap) nextHeap;
Iterator objects = aJavaHeap.getObjects().iterator();
while (objects.hasNext()) {
@@ -71,9 +71,9 @@
break;
}
- JavaObject aJavaObject = (JavaObject) nextObject;
+ JVMObject aJavaObject = (JVMObject) nextObject;
try {
- JavaClass theJavaClass = aJavaObject.getJavaClass();
+ JVMClass theJavaClass = aJavaObject.getJavaClass();
String theClassName = (theJavaClass).getName();
if (theClassName.equals(TestObjectClassName)){
@@ -87,7 +87,7 @@
break;
}
- JavaField theField = (JavaField) nextField;
+ JVMField theField = (JVMField) nextField;
String theFieldName = theField.getName();
if (theFieldName.equals("JavaObject_getDeclaredFields_getName")){
foundObject=true;
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java Wed Oct 21 10:29:55 2009
@@ -18,9 +18,9 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.DataUnavailable;
import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaReference;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMReference;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -35,20 +35,20 @@
public void testMultiDimensionalArrayReferences() {
try {
- JavaObject thisObject = getThis();
- JavaField multiDimArrayField = getJavaField(thisObject, "multiDimArray");
+ JVMObject thisObject = getThis();
+ JVMField multiDimArrayField = getJavaField(thisObject, "multiDimArray");
Object multiDimArrayObject = multiDimArrayField.get(thisObject);
- if (multiDimArrayObject instanceof JavaObject) {
- JavaObject mdObject = (JavaObject)multiDimArrayObject;
+ if (multiDimArrayObject instanceof JVMObject) {
+ JVMObject mdObject = (JVMObject)multiDimArrayObject;
Iterator refs = mdObject.getReferences().iterator();
while (refs.hasNext()) {
Object next = refs.next();
- if (next instanceof JavaReference) {
- JavaReference ref = (JavaReference) next;
+ if (next instanceof JVMReference) {
+ JVMReference ref = (JVMReference) next;
try {
Object target = ref.getTarget();
- if (target instanceof JavaObject) {
- JavaObject targetObject = (JavaObject) target;
+ if (target instanceof JVMObject) {
+ JVMObject targetObject = (JVMObject) target;
System.out.println(targetObject.getJavaClass().getName());
}
System.out.println(ref.getDescription());
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java Wed Oct 21 10:29:55 2009
@@ -20,10 +20,10 @@
import java.lang.ref.WeakReference;
import java.util.Iterator;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaReference;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMReference;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -72,113 +72,113 @@
}
public void testReferences_getDescription() {
- JavaObject thisObj = getThis();
+ JVMObject thisObj = getThis();
Iterator references = thisObj.getReferences().iterator();
while (references.hasNext()) {
Object next = references.next();
- if (!(next instanceof JavaReference)) {
+ if (!(next instanceof JVMReference)) {
continue;
}
- JavaReference ref = (JavaReference)next;
+ JVMReference ref = (JVMReference)next;
assertNotNull("Reference description is null", ref.getDescription());
}
}
public void testReferences_getReachability() throws Exception {
- JavaObject thisObj = getThis();
+ JVMObject thisObj = getThis();
Iterator references = thisObj.getReferences().iterator();
while (references.hasNext()) {
Object next = references.next();
- if (!(next instanceof JavaReference)) {
+ if (!(next instanceof JVMReference)) {
continue;
}
- JavaReference ref = (JavaReference)next;
+ JVMReference ref = (JVMReference)next;
Object target = ref.getTarget();
- if (!(target instanceof JavaObject)) {
+ if (!(target instanceof JVMObject)) {
continue;
}
- JavaObject targetObject = (JavaObject)target;
+ JVMObject targetObject = (JVMObject)target;
if ("java/lang/ref/WeakReference".equals(targetObject.getJavaClass().getName())) {
- JavaReference referent = getReferent(targetObject);
- assertTrue("Reachability for weak referent different from \"Weak\"", JavaReference.REACHABILITY_WEAK == referent.getReachability());
+ JVMReference referent = getReferent(targetObject);
+ assertTrue("Reachability for weak referent different from \"Weak\"", JVMReference.REACHABILITY_WEAK == referent.getReachability());
} else if ("java/lang/ref/SoftReference".equals(targetObject.getJavaClass().getName())) {
- JavaReference referent = getReferent(targetObject);
- assertTrue("Reachability for soft referent different from \"Soft\"", JavaReference.REACHABILITY_SOFT == referent.getReachability());
+ JVMReference referent = getReferent(targetObject);
+ assertTrue("Reachability for soft referent different from \"Soft\"", JVMReference.REACHABILITY_SOFT == referent.getReachability());
} else if ("java/lang/ref/PhantomReference".equals(targetObject.getJavaClass().getName())) {
- JavaReference referent = getReferent(targetObject);
- assertTrue("Reachability for phantom referent different from \"Phantom\"", JavaReference.REACHABILITY_PHANTOM == referent.getReachability());
+ JVMReference referent = getReferent(targetObject);
+ assertTrue("Reachability for phantom referent different from \"Phantom\"", JVMReference.REACHABILITY_PHANTOM == referent.getReachability());
} else if (targetObject.getJavaClass().getName().endsWith("StrongReferent")) {
- assertTrue("Reachability for strong field reference different from \"Strong\"", JavaReference.REACHABILITY_STRONG == ref.getReachability());
+ assertTrue("Reachability for strong field reference different from \"Strong\"", JVMReference.REACHABILITY_STRONG == ref.getReachability());
}
}
}
public void testReferences_isClassReference() throws Exception {
- JavaObject thisObj = getThis();
+ JVMObject thisObj = getThis();
Iterator references = thisObj.getReferences().iterator();
while (references.hasNext()) {
Object next = references.next();
- if (!(next instanceof JavaReference)) {
+ if (!(next instanceof JVMReference)) {
continue;
}
- JavaReference ref = (JavaReference)next;
+ JVMReference ref = (JVMReference)next;
Object target = ref.getTarget();
if (ref.isClassReference()) {
- assertTrue("Supposed class reference has a non-JavaClass target",target instanceof JavaClass);
+ assertTrue("Supposed class reference has a non-JavaClass target",target instanceof JVMClass);
}
}
}
public void testReferences_isObjectReference() throws Exception {
- JavaObject thisObj = getThis();
+ JVMObject thisObj = getThis();
Iterator references = thisObj.getReferences().iterator();
while (references.hasNext()) {
Object next = references.next();
- if (!(next instanceof JavaReference)) {
+ if (!(next instanceof JVMReference)) {
continue;
}
- JavaReference ref = (JavaReference)next;
+ JVMReference ref = (JVMReference)next;
Object target = ref.getTarget();
if (ref.isObjectReference()) {
- assertTrue("Supposed object reference has a non-JavaObject target",target instanceof JavaObject);
+ assertTrue("Supposed object reference has a non-JavaObject target",target instanceof JVMObject);
}
}
}
public void testReferences_getReferenceType() throws Exception {
- JavaObject thisObj = getThis();
+ JVMObject thisObj = getThis();
Iterator references = thisObj.getReferences().iterator();
while (references.hasNext()) {
Object next = references.next();
- if (!(next instanceof JavaReference)) {
+ if (!(next instanceof JVMReference)) {
continue;
}
- JavaReference ref = (JavaReference)next;
+ JVMReference ref = (JVMReference)next;
int type = ref.getReferenceType();
Object source = ref.getSource();
Object target = ref.getTarget();
switch (type) {
- case JavaReference.REFERENCE_FIELD:
- if (source instanceof JavaObject) {
- JavaObject sourceObject = (JavaObject)source;
+ case JVMReference.REFERENCE_FIELD:
+ if (source instanceof JVMObject) {
+ JVMObject sourceObject = (JVMObject)source;
if (!(sourceObject.equals(thisObj))) {
fail("Source object for a field reference not equal to this object.");
}
- if (target instanceof JavaObject) {
- JavaObject targetObject = (JavaObject)target;
+ if (target instanceof JVMObject) {
+ JVMObject targetObject = (JVMObject)target;
String objectsClassName = targetObject.getJavaClass().getName();
if (!(objectsClassName.endsWith("Reference") ||
objectsClassName.endsWith("Referent") ||
@@ -192,16 +192,16 @@
boolean arrayElementFound = false;
while (refs.hasNext()) {
Object next2 = refs.next();
- if (!(next2 instanceof JavaReference)) {
+ if (!(next2 instanceof JVMReference)) {
continue;
}
- JavaReference ref2 = (JavaReference)next2;
+ JVMReference ref2 = (JVMReference)next2;
int type2 = ref2.getReferenceType();
Object target2 = ref2.getTarget();
- if (type2 == JavaReference.REFERENCE_ARRAY_ELEMENT) {
- if (target2 instanceof JavaObject) {
- JavaObject targetObject2 = (JavaObject)target2;
+ if (type2 == JVMReference.REFERENCE_ARRAY_ELEMENT) {
+ if (target2 instanceof JVMObject) {
+ JVMObject targetObject2 = (JVMObject)target2;
String objectsClassName2 = targetObject2.getJavaClass().getName();
if (objectsClassName2.endsWith("ArrayElement") && !targetObject2.isArray()) {
arrayElementFound = true;
@@ -222,34 +222,34 @@
fail("Source object of a field reference is not a valid JavaObject.");
}
break;
- case JavaReference.REFERENCE_CLASS:
- if (source instanceof JavaObject) {
- JavaObject sourceObject = (JavaObject)source;
+ case JVMReference.REFERENCE_CLASS:
+ if (source instanceof JVMObject) {
+ JVMObject sourceObject = (JVMObject)source;
if (!(sourceObject.equals(thisObj))) {
fail("Source object for a CLASS reference not equal to this object.");
}
- if (!(target instanceof JavaClass)) {
+ if (!(target instanceof JVMClass)) {
fail("Target object for a CLASS reference not a JavaClass object.");
}
- JavaClass targetClass = (JavaClass)target;
+ JVMClass targetClass = (JVMClass)target;
assertTrue("Target class for the CLASS reference of this object different from expected.", targetClass.getName().endsWith("TestJavaReferences"));
Iterator refs = targetClass.getReferences().iterator();
boolean classLoaderFound = false;
while (refs.hasNext()) {
Object next2 = refs.next();
- if (!(next2 instanceof JavaReference)) {
+ if (!(next2 instanceof JVMReference)) {
continue;
}
- JavaReference ref2 = (JavaReference)next2;
+ JVMReference ref2 = (JVMReference)next2;
int type2 = ref2.getReferenceType();
Object target2 = ref2.getTarget();
- if (type2 == JavaReference.REFERENCE_CLASS_LOADER) {
- if (!(target2 instanceof JavaObject)) {
+ if (type2 == JVMReference.REFERENCE_CLASS_LOADER) {
+ if (!(target2 instanceof JVMObject)) {
fail("Target object for a CLASSLOADER reference does not represent a JavaObject.");
}
- JavaObject targetObject2 = (JavaObject)target2;
+ JVMObject targetObject2 = (JVMObject)target2;
if (targetObject2.getClass().getName().endsWith("ClassLoader")) {
fail("Target object for a CLASSLOADER reference does not represent a ClassLoader.");
} else {
@@ -263,14 +263,14 @@
fail("Source object of a CLASS reference is not a valid JavaObject.");
}
break;
- case JavaReference.REFERENCE_CLASS_LOADER:
- if (source instanceof JavaObject) {
- JavaObject sourceObject = (JavaObject)source;
+ case JVMReference.REFERENCE_CLASS_LOADER:
+ if (source instanceof JVMObject) {
+ JVMObject sourceObject = (JVMObject)source;
if (!(sourceObject.equals(thisObj))) {
fail("Source object for a CLASSLOADER reference not equal to this object.");
}
- if (!(target instanceof JavaClassLoader)) {
+ if (!(target instanceof JVMClassLoader)) {
fail("Target object for a CLASSLOADER reference not a JavaClass object.");
}
} else {
@@ -284,15 +284,15 @@
}
- private JavaReference getReferent (JavaObject obj) {
+ private JVMReference getReferent (JVMObject obj) {
Iterator references = obj.getReferences().iterator();
- JavaReference referent = null;
+ JVMReference referent = null;
while (references.hasNext() && referent == null) {
Object next = references.next();
- if (!(next instanceof JavaReference)) {
+ if (!(next instanceof JVMReference)) {
continue;
}
- JavaReference ref = (JavaReference)next;
+ JVMReference ref = (JVMReference)next;
String description = ref.getDescription();
if (description.indexOf("referent") == -1) {
continue;
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java Wed Oct 21 10:29:55 2009
@@ -17,9 +17,9 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaVMInitArgs;
-import javax.tools.diagnostics.runtime.java.JavaVMOption;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMInitArgs;
+import javax.tools.diagnostics.runtime.java.JVMOption;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -41,7 +41,7 @@
public void testJavaJavaRuntime_getVersion() throws CorruptDataException, DataUnavailable
{
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
String version=runtime.getVersion();
System.out.println("runtime.getVersion "+version);
assertNotNull(version);
@@ -50,14 +50,14 @@
public void testJavaJavaRuntime_getVersionDetail() throws CorruptDataException, DataUnavailable
{
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
String version=runtime.getVersion();
- JavaVMInitArgs args=runtime.getJavaVMInitArgs();
+ JVMInitArgs args=runtime.getJavaVMInitArgs();
Iterator i=args.getOptions().iterator();
while(i.hasNext()) {
- JavaVMOption option=(JavaVMOption) i.next();
+ JVMOption option=(JVMOption) i.next();
String data=option.getOptionString();
if(data.startsWith(DTCK_TEST_RUNTIME_VERSION)) {
String received=data.substring(DTCK_TEST_RUNTIME_VERSION.length());
@@ -72,7 +72,7 @@
public void testJavaRuntime_getFullVersion()
{
- JavaRuntime runtime=(JavaRuntime) getJavaRuntime();
+ JVMRuntime runtime=(JVMRuntime) getJavaRuntime();
String theFV=null;
try {
theFV=runtime.getFullVersion();
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java Wed Oct 21 10:29:55 2009
@@ -18,11 +18,11 @@
import java.util.List;
import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -62,7 +62,7 @@
public void testHasThreads() {
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
Iterator threadIterator=runtime.getThreads().iterator();
assertNotNull(threadIterator);
assertTrue(threadIterator.hasNext());
@@ -91,9 +91,9 @@
List allThreads = getJavaRuntime().getThreads();
- JavaThread t1=getThread(allThreads,DTFJ_TCK_T1);
+ JVMThread t1=getThread(allThreads,DTFJ_TCK_T1);
int state=t1.getState();
- assertEquals(JavaThread.STATE_ALIVE | JavaThread.STATE_WAITING | JavaThread.STATE_SLEEPING,state);
+ assertEquals(JVMThread.STATE_ALIVE | JVMThread.STATE_WAITING | JVMThread.STATE_SLEEPING,state);
}
@@ -101,7 +101,7 @@
List allThreads = getJavaRuntime().getThreads();
- JavaThread t1=getThread(allThreads,DTFJ_TCK_T1);
+ JVMThread t1=getThread(allThreads,DTFJ_TCK_T1);
Iterator i=t1.getStackFrames().iterator();
assertTrue(i.hasNext());
@@ -111,10 +111,10 @@
List allThreads = getJavaRuntime().getThreads();
- JavaThread t1=getThread(allThreads,DTFJ_TCK_T1);
+ JVMThread t1=getThread(allThreads,DTFJ_TCK_T1);
Iterator i=t1.getStackFrames().iterator();
- JavaStackFrame frame=(JavaStackFrame) i.next();
- JavaLocation location=frame.getLocation();
+ JVMStackFrame frame=(JVMStackFrame) i.next();
+ JVMLocation location=frame.getLocation();
assertNotNull(location);
@@ -123,11 +123,11 @@
List allThreads = getJavaRuntime().getThreads();
- JavaThread t1=getThread(allThreads,DTFJ_TCK_T1);
+ JVMThread t1=getThread(allThreads,DTFJ_TCK_T1);
Iterator i=t1.getStackFrames().iterator();
- JavaStackFrame frame=(JavaStackFrame) i.next();
- JavaLocation location=frame.getLocation();
- JavaMethod method=location.getMethod();
+ JVMStackFrame frame=(JVMStackFrame) i.next();
+ JVMLocation location=frame.getLocation();
+ JVMMethod method=location.getMethod();
assertNotNull(method);
@@ -136,11 +136,11 @@
List allThreads = getJavaRuntime().getThreads();
- JavaThread t1=getThread(allThreads,DTFJ_TCK_T1);
+ JVMThread t1=getThread(allThreads,DTFJ_TCK_T1);
Iterator i=t1.getStackFrames().iterator();
- JavaStackFrame frame=(JavaStackFrame) i.next();
- JavaLocation location=frame.getLocation();
- JavaMethod method=location.getMethod();
+ JVMStackFrame frame=(JVMStackFrame) i.next();
+ JVMLocation location=frame.getLocation();
+ JVMMethod method=location.getMethod();
String name=method.getName();
assertEquals(name,"sleep");
@@ -149,13 +149,13 @@
}
private List getThreads() {
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
Iterator threadIterator=runtime.getThreads().iterator();
List allThreads=new LinkedList();
while(threadIterator.hasNext()) {
- JavaThread thread=(JavaThread) threadIterator.next();
+ JVMThread thread=(JVMThread) threadIterator.next();
allThreads.add(thread);
}
return allThreads;
@@ -165,15 +165,15 @@
public void testThreadGroupMembership() throws CorruptDataException {
List allThreads = getJavaRuntime().getThreads();
- JavaThread t1=getThread(allThreads, DTFJ_TCK_T1);
+ JVMThread t1=getThread(allThreads, DTFJ_TCK_T1);
}
- private JavaThread getThread(List allThreads, String threadname) throws CorruptDataException {
+ private JVMThread getThread(List allThreads, String threadname) throws CorruptDataException {
Iterator i=allThreads.iterator();
while(i.hasNext()) {
- JavaThread thread=(JavaThread) i.next();
+ JVMThread thread=(JVMThread) i.next();
String name=thread.getName();
if(name.equals(threadname)) return thread;
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java Wed Oct 21 10:29:55 2009
@@ -16,8 +16,8 @@
import java.util.Iterator;
import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -41,22 +41,22 @@
}
public void testHasCompiledMethods() {
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
Iterator compiledMethods=runtime.getCompiledMethods().iterator();
assertNotNull(compiledMethods);
assertTrue(compiledMethods.hasNext());
}
public void testConfiguredCompiledMethods() {
- JavaRuntime runtime=getJavaRuntime();
+ JVMRuntime runtime=getJavaRuntime();
Iterator compiledMethods=runtime.getCompiledMethods().iterator();
boolean found = false;
while (compiledMethods.hasNext() && !found) {
Object next = compiledMethods.next();
- if (!(next instanceof JavaMethod)) {
+ if (!(next instanceof JVMMethod)) {
continue;
}
- JavaMethod method = (JavaMethod)next;
+ JVMMethod method = (JVMMethod)next;
try {
String methodName = method.getName();
// System.out.println("Current method is: "+ methodName);
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java Wed Oct 21 10:29:55 2009
@@ -24,13 +24,13 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.DataUnavailable;
import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaReference;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMReference;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMThread;
import org.apache.kato.tck.api.ICheckpoint;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -42,7 +42,7 @@
private static Map rootsCheckList = null;
- private static JavaClass javaLangString = null;
+ private static JVMClass javaLangString = null;
private static java.lang.ClassLoader cl = null;
@@ -79,8 +79,8 @@
}
public String toString() {
- if (root instanceof JavaObject) {
- JavaObject objectRoot = (JavaObject)root;
+ if (root instanceof JVMObject) {
+ JVMObject objectRoot = (JVMObject)root;
String objectId = null;
try {
objectId = objectRoot.getJavaClass().getName() + "@" + objectRoot.getID();
@@ -96,29 +96,29 @@
public static String getRootTypeDescription(int type) {
switch (type) {
- case JavaReference.HEAP_ROOT_CLASSLOADER:
+ case JVMReference.HEAP_ROOT_CLASSLOADER:
return "Classloader";
- case JavaReference.HEAP_ROOT_FINALIZABLE_OBJ:
+ case JVMReference.HEAP_ROOT_FINALIZABLE_OBJ:
return "Finalizable object";
- case JavaReference.HEAP_ROOT_JNI_GLOBAL:
+ case JVMReference.HEAP_ROOT_JNI_GLOBAL:
return "JNI Global";
- case JavaReference.HEAP_ROOT_JNI_LOCAL:
+ case JVMReference.HEAP_ROOT_JNI_LOCAL:
return "JNI Local";
- case JavaReference.HEAP_ROOT_MONITOR:
+ case JVMReference.HEAP_ROOT_MONITOR:
return "Monitor";
- case JavaReference.HEAP_ROOT_OTHER:
+ case JVMReference.HEAP_ROOT_OTHER:
return "Other root";
- case JavaReference.HEAP_ROOT_STACK_LOCAL:
+ case JVMReference.HEAP_ROOT_STACK_LOCAL:
return "Stack local";
- case JavaReference.HEAP_ROOT_STRINGTABLE:
+ case JVMReference.HEAP_ROOT_STRINGTABLE:
return "String table";
- case JavaReference.HEAP_ROOT_SYSTEM_CLASS:
+ case JVMReference.HEAP_ROOT_SYSTEM_CLASS:
return "System class";
- case JavaReference.HEAP_ROOT_THREAD:
+ case JVMReference.HEAP_ROOT_THREAD:
return "Thread";
- case JavaReference.HEAP_ROOT_UNFINALIZED_OBJ:
+ case JVMReference.HEAP_ROOT_UNFINALIZED_OBJ:
return "Unfinalized object";
- case JavaReference.HEAP_ROOT_UNKNOWN:
+ case JVMReference.HEAP_ROOT_UNKNOWN:
return "Unknown";
default:
return "<Unrecognized root type>";
@@ -225,7 +225,7 @@
if (rootsCheckList == null) {
rootsCheckList = getRootsCheckList();
}
- HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestThread", JavaReference.HEAP_ROOT_THREAD);
+ HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestThread", JVMReference.HEAP_ROOT_THREAD);
assertTrue("Found thread not reported as root.", roots.length != 0);
}
@@ -233,7 +233,7 @@
if (rootsCheckList == null) {
rootsCheckList = getRootsCheckList();
}
- HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestClassLoader", JavaReference.HEAP_ROOT_CLASSLOADER);
+ HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestClassLoader", JVMReference.HEAP_ROOT_CLASSLOADER);
assertTrue("Found classloader not reported as root.", roots.length != 0);
}
@@ -241,7 +241,7 @@
if (rootsCheckList == null) {
rootsCheckList = getRootsCheckList();
}
- HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestUnfinalized", JavaReference.HEAP_ROOT_UNFINALIZED_OBJ);
+ HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestUnfinalized", JVMReference.HEAP_ROOT_UNFINALIZED_OBJ);
assertTrue("Found unfinalized object not reported as root.", roots.length != 0);
}
@@ -251,7 +251,7 @@
rootsCheckList = getRootsCheckList();
}
- HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestFinalizable", JavaReference.HEAP_ROOT_FINALIZABLE_OBJ);
+ HeapRoot[] roots = searchRootByClassName(rootsCheckList, "HeapRootsTestFinalizable", JVMReference.HEAP_ROOT_FINALIZABLE_OBJ);
assertTrue("Found finalizable object not reported as root.", roots.length != 0);
}
@@ -260,16 +260,16 @@
if (rootsCheckList == null) {
rootsCheckList = getRootsCheckList();
}
- HeapRoot[] roots = searchRootByClassName(rootsCheckList, "", JavaReference.HEAP_ROOT_STRINGTABLE);
+ HeapRoot[] roots = searchRootByClassName(rootsCheckList, "", JVMReference.HEAP_ROOT_STRINGTABLE);
HeapRoot currentRoot = null;
- JavaField countField = null;
- JavaField valueField = null;
+ JVMField countField = null;
+ JVMField valueField = null;
Iterator fields = javaLangString.getDeclaredFields().iterator();
while (fields.hasNext()) {
Object next = fields.next();
- if (next instanceof JavaField) {
- JavaField field = (JavaField) next;
+ if (next instanceof JVMField) {
+ JVMField field = (JVMField) next;
try {
if (field.getName().equals("value")) {
valueField = field;
@@ -286,17 +286,17 @@
for (int i=0; i<roots.length; i++) {
currentRoot = roots[i];
Object rootObject = currentRoot.getRoot();
- if (!(rootObject instanceof JavaObject)) {
+ if (!(rootObject instanceof JVMObject)) {
continue;
}
- JavaObject root = (JavaObject)rootObject;
+ JVMObject root = (JVMObject)rootObject;
try {
int length = countField.getInt(root);
char[] contents = new char[length];
Object valueObj = valueField.get(root);
- if (valueObj instanceof JavaObject) {
- JavaObject value = (JavaObject)valueObj;
+ if (valueObj instanceof JVMObject) {
+ JVMObject value = (JVMObject)valueObj;
value.arraycopy(0, contents, 0, length);
}
@@ -337,7 +337,7 @@
*/
private Map getRootsCheckList() {
- JavaRuntime runtime = getJavaRuntime();
+ JVMRuntime runtime = getJavaRuntime();
Map rootsCheckList = new HashMap();
Iterator roots = runtime.getHeapRoots().iterator();
while (roots.hasNext()) {
@@ -345,7 +345,7 @@
if (next instanceof CorruptData) {
continue;
}
- JavaReference r = (JavaReference)next;
+ JVMReference r = (JVMReference)next;
try {
Object root = r.getTarget();
int type = r.getRootType();
@@ -363,7 +363,7 @@
/** Tests whether all the system classes are correctly reported as roots */
// need to ignore primitive types
private boolean checkSystemClasses(Map rootsCheckList) {
- JavaClassLoader systemClassLoader = getBootClassLoader();
+ JVMClassLoader systemClassLoader = getBootClassLoader();
Iterator systemClasses = systemClassLoader.getDefinedClasses().iterator();
boolean passed = true;
String systemClassName = null;
@@ -372,7 +372,7 @@
if (next instanceof CorruptData) {
continue;
}
- JavaClass systemClass = (JavaClass)next;
+ JVMClass systemClass = (JVMClass)next;
try {
systemClassName = systemClass.getName();
} catch (CorruptDataException e) {
@@ -396,7 +396,7 @@
|| systemClassName.equals("float")
|| systemClassName.equals("double")))
{
- Object rootClass = rootsCheckList.get(new HeapRoot(systemClass,JavaReference.HEAP_ROOT_SYSTEM_CLASS));
+ Object rootClass = rootsCheckList.get(new HeapRoot(systemClass,JVMReference.HEAP_ROOT_SYSTEM_CLASS));
if (rootClass == null) {
System.out.println("Found a class loaded by the system classloader which is NOT a root:" + systemClassName);
passed = false;
@@ -430,10 +430,10 @@
continue;
}
try {
- if (root instanceof JavaObject) {
- className = ((JavaObject)root).getJavaClass().getName();
- } else if (root instanceof JavaClass) {
- className = ((JavaClass)root).getName();
+ if (root instanceof JVMObject) {
+ className = ((JVMObject)root).getJavaClass().getName();
+ } else if (root instanceof JVMClass) {
+ className = ((JVMClass)root).getName();
} else {
continue;
}
@@ -458,12 +458,12 @@
* and not in JavaStackFrames because of conservative garbage collection.
*/
public void testJavaThreadRoots() throws Exception {
- JavaThread thread = null;
+ JVMThread thread = null;
// Find the thread to match as a root source.
Iterator threads = getJavaRuntime().getThreads().iterator();
while(threads.hasNext()) {
- JavaThread candidateThread = (JavaThread) threads.next();
+ JVMThread candidateThread = (JVMThread) threads.next();
if (javaLocalRootsthreadName.equals(candidateThread.getName())) {
thread = candidateThread;
break;
@@ -482,11 +482,11 @@
// Remove their class names from our set of expected names.
Iterator rootIterator = getJavaRuntime().getHeapRoots().iterator();
while(rootIterator.hasNext()) {
- JavaReference reference = (JavaReference) rootIterator.next();
+ JVMReference reference = (JVMReference) rootIterator.next();
if (thread.equals(reference.getSource())) {
- if(reference.getTarget() instanceof JavaObject) {
- JavaObject target = (JavaObject) reference.getTarget();
+ if(reference.getTarget() instanceof JVMObject) {
+ JVMObject target = (JVMObject) reference.getTarget();
roots.remove(target.getJavaClass().getName());
}
}