From kato-commits-return-464-apmail-incubator-kato-commits-archive=incubator.apache.org@incubator.apache.org Fri Jul 10 23:07:46 2009 Return-Path: Delivered-To: apmail-incubator-kato-commits-archive@minotaur.apache.org Received: (qmail 20698 invoked from network); 10 Jul 2009 23:07:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jul 2009 23:07:45 -0000 Received: (qmail 14307 invoked by uid 500); 10 Jul 2009 23:07:55 -0000 Delivered-To: apmail-incubator-kato-commits-archive@incubator.apache.org Received: (qmail 14285 invoked by uid 500); 10 Jul 2009 23:07:55 -0000 Mailing-List: contact kato-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: kato-dev@incubator.apache.org Delivered-To: mailing list kato-commits@incubator.apache.org Received: (qmail 14275 invoked by uid 99); 10 Jul 2009 23:07:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 23:07:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 23:07:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 380FB2388892; Fri, 10 Jul 2009 23:07:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r793142 [1/3] - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite: ./ src/main/java/org/apache/kato/tck/tests/javaruntime/ src/main/java/org/apache/kato/tck/tests/process/ src/main/java/org/apache... Date: Fri, 10 Jul 2009 23:07:22 -0000 To: kato-commits@incubator.apache.org From: spoole@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090710230726.380FB2388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: spoole Date: Fri Jul 10 23:07:20 2009 New Revision: 793142 URL: http://svn.apache.org/viewvc?rev=793142&view=rev Log: fixed up testcases in testsuite to compile now iterators are no longer returned Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/ (props changed) incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/pom.xml incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestEnvironmentVariables.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/TestImage.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageAddressSpace.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetCreationTime.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetHostName.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetIPAddresses.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetInstalledMemory.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorCount.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorSubType.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetProcessorType.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemSubType.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/process/image/TestImageGetSystemType.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateAIXClassTag.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateDumpTypeMethodTag.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateLinuxClassTag.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOS390ClassTag.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateOSMethodTag.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/tagvalidation/TestValidateWindowsClassTag.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/AbstractDTFJTestcase.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJImageLoader.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/DTFJManifestTests.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageAddressSpaceTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageFactoryTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageModuleTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImagePointerTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageProcessTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageRegisterTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageStackFrameTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageSymbolTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/ImageThreadTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassLoaderTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaClassTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaFieldTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaHeapTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaLocationTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMonitorTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaObjectTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaRuntimeTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaStackFrameTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaThreadTest.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/TestNotImplementedException.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/TestPackageInformation.java incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/scenarios/ArrayletTest.java Propchange: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jul 10 23:07:20 2009 @@ -0,0 +1 @@ +target Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/pom.xml URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/pom.xml?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/pom.xml (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/pom.xml Fri Jul 10 23:07:20 2009 @@ -10,4 +10,18 @@ Test Suite 0.0.1-SNAPSHOT TCK Test suite + + + org.apache.kato + kato.tck.harness + 0.0.1-SNAPSHOT + compile + + + junit + junit + 3.8.1 + compile + + \ No newline at end of file Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java Fri Jul 10 23:07:20 2009 @@ -15,13 +15,13 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaClassLoader; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaClassLoader; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -57,7 +57,7 @@ boolean foundClassLoader = false; JavaRuntime runtime=getJavaRuntime(); - Iterator classloaders = runtime.getJavaClassLoaders(); + Iterator classloaders = runtime.getJavaClassLoaders().iterator(); while (classloaders.hasNext()) { Object nextClassloader = classloaders.next(); @@ -77,7 +77,7 @@ } theJavaClass = classLoaderObject.getJavaClass(); - Iterator fields = theJavaClass.getDeclaredFields(); + Iterator fields = theJavaClass.getDeclaredFields().iterator(); while (fields.hasNext()) { Object nextField = fields.next(); Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java Fri Jul 10 23:07:20 2009 @@ -15,12 +15,12 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaHeap; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaHeap; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -56,7 +56,7 @@ JavaRuntime runtime=getJavaRuntime(); - Iterator heaps = runtime.getHeaps(); + Iterator heaps = runtime.getHeaps().iterator(); while (heaps.hasNext()) { Object nextHeap = heaps.next(); @@ -66,7 +66,7 @@ } JavaHeap aJavaHeap = (JavaHeap) nextHeap; - Iterator objects = aJavaHeap.getObjects(); + Iterator objects = aJavaHeap.getObjects().iterator(); while (objects.hasNext()) { Object nextObject = objects.next(); Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java Fri Jul 10 23:07:20 2009 @@ -13,9 +13,9 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java Fri Jul 10 23:07:20 2009 @@ -15,8 +15,8 @@ import java.lang.reflect.Modifier; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java Fri Jul 10 23:07:20 2009 @@ -13,8 +13,8 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java Fri Jul 10 23:07:20 2009 @@ -13,9 +13,9 @@ ******************************************************************************/ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java Fri Jul 10 23:07:20 2009 @@ -14,9 +14,9 @@ package org.apache.kato.tck.tests.javaruntime; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java Fri Jul 10 23:07:20 2009 @@ -15,9 +15,9 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptData; -import org.apache.kato.java.JavaHeap; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.java.JavaHeap; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -33,7 +33,7 @@ JavaRuntime runtime=getJavaRuntime(); - Iterator heaps = runtime.getHeaps(); + Iterator heaps = runtime.getHeaps().iterator(); while (heaps.hasNext()) { Object nextHeap = heaps.next(); Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java Fri Jul 10 23:07:20 2009 @@ -15,12 +15,12 @@ import java.util.Iterator; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaLocation; -import org.apache.kato.java.JavaMethod; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaStackFrame; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaLocation; +import javax.tools.diagnostics.java.JavaMethod; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaStackFrame; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.api.ICheckpoint; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -44,7 +44,7 @@ private static final String methodName = "configure\u0412\u043e\u0434\u043a\u0430"; /** - * Get this class directly, and find the method via getDeclaredMethods(); + * Get this class directly, and find the method via getDeclaredMethods().iterator(); * * @throws Exception */ @@ -53,7 +53,7 @@ assertNotNull("Unable to find this class", thisClass); - Iterator methods = thisClass.getDeclaredMethods(); + Iterator methods = thisClass.getDeclaredMethods().iterator(); boolean found=false; while(methods.hasNext()) { JavaMethod method = (JavaMethod) methods.next(); @@ -74,7 +74,7 @@ * @throws Exception */ public void testGetStackMethods() throws Exception { - Iterator threads = getJavaRuntime().getThreads(); + Iterator threads = getJavaRuntime().getThreads().iterator(); JavaThread testThread = null; while(threads.hasNext()) { @@ -93,7 +93,7 @@ assertNotNull("Unable to find thread "+threadName, testThread); - Iterator frames = testThread.getStackFrames(); + Iterator frames = testThread.getStackFrames().iterator(); boolean found = false; while(frames.hasNext()) { Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java Fri Jul 10 23:07:20 2009 @@ -17,15 +17,15 @@ import java.util.Iterator; import java.util.Set; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.image.ImagePointer; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaMonitor; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaRuntime; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.image.ImagePointer; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaMonitor; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -154,7 +154,7 @@ System.out.println("\nmonitor.getEntersWaiters():"); - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -179,7 +179,7 @@ System.out.println("\nmonitor.getNotifyWaiters():"); - Iterator notifiers = monitor.getNotifyWaiters(); + Iterator notifiers = monitor.getNotifyWaiters().iterator(); while (notifiers.hasNext()) { Object next = notifiers.next(); @@ -434,7 +434,7 @@ public void findMonitors() throws Exception { JavaRuntime runtime = getJavaRuntime(); - Iterator monitorIterator = runtime.getMonitors(); + Iterator monitorIterator = runtime.getMonitors().iterator(); // Search through all monitors for this test's monitor. while (monitorIterator.hasNext()) { @@ -456,7 +456,7 @@ continue; } - Iterator fields = monitorClass.getDeclaredFields(); + Iterator fields = monitorClass.getDeclaredFields().iterator(); while (fields.hasNext()) { Object next2 = fields.next(); @@ -506,7 +506,7 @@ public void testCountWaiters_0_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -519,7 +519,7 @@ public void testCountEnters_0_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -539,7 +539,7 @@ public void testNameWaiters_0_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { JavaThread next = (JavaThread) waiters.next(); @@ -555,7 +555,7 @@ public void testNameEnters_0_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 1, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { JavaThread next = (JavaThread) enters.next(); @@ -596,7 +596,7 @@ public void testCountWaiters_0_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -609,7 +609,7 @@ public void testCountEnters_0_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -629,7 +629,7 @@ public void testNameWaiters_0_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { JavaThread next = (JavaThread) waiters.next(); @@ -644,7 +644,7 @@ public void testNameEnters_0_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 0, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { JavaThread next = (JavaThread) enters.next(); @@ -685,7 +685,7 @@ public void testCountWaiters_1_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -698,7 +698,7 @@ public void testCountEnters_1_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -718,7 +718,7 @@ public void testNameWaiters_1_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { JavaThread next = (JavaThread) waiters.next(); @@ -732,7 +732,7 @@ public void testNameEnters_1_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 0).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { JavaThread next = (JavaThread) enters.next(); @@ -765,7 +765,7 @@ public void testCountWaiters_1_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -778,8 +778,8 @@ public void testCountEnters_1_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); - enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); + enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -799,10 +799,10 @@ public void testNameWaiters_1_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); - Iterator monitors = getJavaRuntime().getMonitors(); - monitors = getJavaRuntime().getMonitors(); + Iterator monitors = getJavaRuntime().getMonitors().iterator(); + monitors = getJavaRuntime().getMonitors().iterator(); while (waiters.hasNext()) { @@ -817,7 +817,7 @@ public void testNameEnters_1_1_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { JavaThread next = (JavaThread) enters.next(); @@ -858,7 +858,7 @@ public void testCountWaiters_2_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -871,7 +871,7 @@ public void testCountEnters_2_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -891,7 +891,7 @@ public void testNameWaiters_2_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { JavaThread next = (JavaThread) waiters.next(); @@ -905,7 +905,7 @@ public void testNameEnters_2_0_0() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { JavaThread next = (JavaThread) enters.next(); @@ -937,7 +937,7 @@ public void testCountWaiters_1_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -950,7 +950,7 @@ public void testCountEnters_1_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -970,7 +970,7 @@ public void testNameWaiters_1_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { JavaThread next = (JavaThread) waiters.next(); @@ -984,7 +984,7 @@ public void testNameEnters_1_0_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { JavaThread next = (JavaThread) enters.next(); @@ -1024,7 +1024,7 @@ public void testCountWaiters_0_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -1037,7 +1037,7 @@ public void testCountEnters_0_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -1057,7 +1057,7 @@ public void testNameWaiters_0_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { JavaThread next = (JavaThread) waiters.next(); @@ -1070,7 +1070,7 @@ public void testNameEnters_0_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor(); - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); String error = checkNames(enters, generatePrefix(0, 2, 1) + "-" + monitorEnterThreadName, 2); @@ -1109,7 +1109,7 @@ public void testCountWaiters_2_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor(); int count = 0; - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); while (waiters.hasNext()) { Object next = waiters.next(); @@ -1122,7 +1122,7 @@ public void testCountEnters_2_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor(); int count = 0; - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); while (enters.hasNext()) { Object next = enters.next(); @@ -1141,7 +1141,7 @@ public void testNameWaiters_2_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor(); - Iterator waiters = monitor.getNotifyWaiters(); + Iterator waiters = monitor.getNotifyWaiters().iterator(); String error = checkNames(waiters, generatePrefix(2, 2, 1) + "-" + monitorNotifyThreadName , 2); @@ -1150,7 +1150,7 @@ public void testNameEnters_2_2_1() throws Exception { JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor(); - Iterator enters = monitor.getEnterWaiters(); + Iterator enters = monitor.getEnterWaiters().iterator(); String error = checkNames(enters, generatePrefix(2, 2, 1) + "-" + monitorEnterThreadName, 2); Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java Fri Jul 10 23:07:20 2009 @@ -16,13 +16,13 @@ import java.util.Arrays; import java.util.Iterator; -import org.apache.kato.image.CorruptData; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaClassLoader; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaHeap; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaClassLoader; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaHeap; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -118,7 +118,7 @@ staticRuntime = runtime; JavaObject theJavaObject=null; - Iterator heaps = runtime.getHeaps(); + Iterator heaps = runtime.getHeaps().iterator(); JavaClass theJavaClass = null; while (heaps.hasNext()) { @@ -129,7 +129,7 @@ } JavaHeap aJavaHeap = (JavaHeap) nextHeap; - Iterator objects = aJavaHeap.getObjects(); + Iterator objects = aJavaHeap.getObjects().iterator(); while (objects.hasNext()) { Object nextObject = objects.next(); @@ -154,7 +154,7 @@ return; } - Iterator fields = theJavaClass.getDeclaredFields(); + Iterator fields = theJavaClass.getDeclaredFields().iterator(); while (fields.hasNext()) { @@ -196,7 +196,7 @@ // Find the JavaField "value" in "java/lang/Integer" - Iterator classLoaders = getJavaRuntime().getJavaClassLoaders(); + Iterator classLoaders = getJavaRuntime().getJavaClassLoaders().iterator(); JavaClass integerClass = null; CLASSLOADERS: @@ -209,7 +209,7 @@ JavaClassLoader loader = (JavaClassLoader) next; - Iterator classes = loader.getDefinedClasses(); + Iterator classes = loader.getDefinedClasses().iterator(); while (classes.hasNext()) { Object next2 = classes.next(); @@ -231,7 +231,7 @@ throw new Exception("Couldn't find java/lang/Integer JavaClass"); } - Iterator integerFields = integerClass.getDeclaredFields(); + Iterator integerFields = integerClass.getDeclaredFields().iterator(); // Find the value field in the class. while (integerFields.hasNext()) { Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java Fri Jul 10 23:07:20 2009 @@ -15,13 +15,13 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaHeap; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaHeap; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -51,7 +51,7 @@ JavaRuntime runtime=getJavaRuntime(); - Iterator heaps = runtime.getHeaps(); + Iterator heaps = runtime.getHeaps().iterator(); while (heaps.hasNext()) { Object nextHeap = heaps.next(); @@ -61,7 +61,7 @@ } JavaHeap aJavaHeap = (JavaHeap) nextHeap; - Iterator objects = aJavaHeap.getObjects(); + Iterator objects = aJavaHeap.getObjects().iterator(); while (objects.hasNext()) { Object nextObject = objects.next(); @@ -76,7 +76,7 @@ String theClassName = (theJavaClass).getName(); if (theClassName.equals(TestObjectClassName)){ - Iterator fields = theJavaClass.getDeclaredFields(); + Iterator fields = theJavaClass.getDeclaredFields().iterator(); while (fields.hasNext()) { Object nextField = fields.next(); Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java Fri Jul 10 23:07:20 2009 @@ -15,12 +15,12 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.image.DataUnavailable; -import org.apache.kato.image.MemoryAccessException; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaReference; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.image.DataUnavailable; +import javax.tools.diagnostics.image.MemoryAccessException; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaReference; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -39,7 +39,7 @@ Object multiDimArrayObject = multiDimArrayField.get(thisObject); if (multiDimArrayObject instanceof JavaObject) { JavaObject mdObject = (JavaObject)multiDimArrayObject; - Iterator refs = mdObject.getReferences(); + Iterator refs = mdObject.getReferences().iterator(); while (refs.hasNext()) { Object next = refs.next(); if (next instanceof JavaReference) { Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java Fri Jul 10 23:07:20 2009 @@ -20,10 +20,10 @@ import java.lang.ref.WeakReference; import java.util.Iterator; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaClassLoader; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaReference; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaClassLoader; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaReference; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; public class TestJavaReferences extends TCKJavaRuntimeTestcase { @@ -72,7 +72,7 @@ public void testReferences_getDescription() { JavaObject thisObj = getThis(); - Iterator references = thisObj.getReferences(); + Iterator references = thisObj.getReferences().iterator(); while (references.hasNext()) { Object next = references.next(); @@ -86,7 +86,7 @@ public void testReferences_getReachability() throws Exception { JavaObject thisObj = getThis(); - Iterator references = thisObj.getReferences(); + Iterator references = thisObj.getReferences().iterator(); while (references.hasNext()) { Object next = references.next(); @@ -120,7 +120,7 @@ public void testReferences_isClassReference() throws Exception { JavaObject thisObj = getThis(); - Iterator references = thisObj.getReferences(); + Iterator references = thisObj.getReferences().iterator(); while (references.hasNext()) { Object next = references.next(); @@ -138,7 +138,7 @@ public void testReferences_isObjectReference() throws Exception { JavaObject thisObj = getThis(); - Iterator references = thisObj.getReferences(); + Iterator references = thisObj.getReferences().iterator(); while (references.hasNext()) { Object next = references.next(); @@ -156,7 +156,7 @@ public void testReferences_getReferenceType() throws Exception { JavaObject thisObj = getThis(); - Iterator references = thisObj.getReferences(); + Iterator references = thisObj.getReferences().iterator(); while (references.hasNext()) { Object next = references.next(); @@ -187,7 +187,7 @@ } if (objectsClassName.endsWith("ArrayElement;") && targetObject.isArray()) { //found the array field. - Iterator refs = targetObject.getReferences(); + Iterator refs = targetObject.getReferences().iterator(); boolean arrayElementFound = false; while (refs.hasNext()) { Object next2 = refs.next(); @@ -233,7 +233,7 @@ } JavaClass targetClass = (JavaClass)target; assertTrue("Target class for the CLASS reference of this object different from expected.", targetClass.getName().endsWith("TestJavaReferences")); - Iterator refs = targetClass.getReferences(); + Iterator refs = targetClass.getReferences().iterator(); boolean classLoaderFound = false; while (refs.hasNext()) { Object next2 = refs.next(); @@ -284,7 +284,7 @@ private JavaReference getReferent (JavaObject obj) { - Iterator references = obj.getReferences(); + Iterator references = obj.getReferences().iterator(); JavaReference referent = null; while (references.hasNext() && referent == null) { Object next = references.next(); Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java Fri Jul 10 23:07:20 2009 @@ -15,11 +15,11 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.image.DataUnavailable; -import org.apache.kato.java.JavaRuntime; -import org.apache.kato.java.JavaVMInitArgs; -import org.apache.kato.java.JavaVMOption; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.image.DataUnavailable; +import javax.tools.diagnostics.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaVMInitArgs; +import javax.tools.diagnostics.java.JavaVMOption; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -54,7 +54,7 @@ JavaVMInitArgs args=runtime.getJavaVMInitArgs(); - Iterator i=args.getOptions(); + Iterator i=args.getOptions().iterator(); while(i.hasNext()) { JavaVMOption option=(JavaVMOption) i.next(); String data=option.getOptionString(); Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java Fri Jul 10 23:07:20 2009 @@ -17,12 +17,12 @@ import java.util.LinkedList; import java.util.List; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.java.JavaLocation; -import org.apache.kato.java.JavaMethod; -import org.apache.kato.java.JavaRuntime; -import org.apache.kato.java.JavaStackFrame; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.java.JavaLocation; +import javax.tools.diagnostics.java.JavaMethod; +import javax.tools.diagnostics.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaStackFrame; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -62,7 +62,7 @@ public void testHasThreads() { JavaRuntime runtime=getJavaRuntime(); - Iterator threadIterator=runtime.getThreads(); + Iterator threadIterator=runtime.getThreads().iterator(); assertNotNull(threadIterator); assertTrue(threadIterator.hasNext()); @@ -78,7 +78,7 @@ public void testHasExpectedThreads() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); assertNotNull(getThread(allThreads,DTFJ_TCK_T1)); assertNotNull(getThread(allThreads,DTFJ_TCK_T2)); @@ -88,7 +88,7 @@ public void testExpectedThreadState() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); JavaThread t1=getThread(allThreads,DTFJ_TCK_T1); int state=t1.getState(); @@ -98,20 +98,20 @@ public void testHasThreadStack() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); JavaThread t1=getThread(allThreads,DTFJ_TCK_T1); - Iterator i=t1.getStackFrames(); + Iterator i=t1.getStackFrames().iterator(); assertTrue(i.hasNext()); } public void testThreadStackFrameLocation() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); JavaThread t1=getThread(allThreads,DTFJ_TCK_T1); - Iterator i=t1.getStackFrames(); + Iterator i=t1.getStackFrames().iterator(); JavaStackFrame frame=(JavaStackFrame) i.next(); JavaLocation location=frame.getLocation(); assertNotNull(location); @@ -120,10 +120,10 @@ } public void testThreadStackFrameLocationMethod() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); JavaThread t1=getThread(allThreads,DTFJ_TCK_T1); - Iterator i=t1.getStackFrames(); + Iterator i=t1.getStackFrames().iterator(); JavaStackFrame frame=(JavaStackFrame) i.next(); JavaLocation location=frame.getLocation(); JavaMethod method=location.getMethod(); @@ -133,10 +133,10 @@ } public void testThreadStackFrameLocationMethodName() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); JavaThread t1=getThread(allThreads,DTFJ_TCK_T1); - Iterator i=t1.getStackFrames(); + Iterator i=t1.getStackFrames().iterator(); JavaStackFrame frame=(JavaStackFrame) i.next(); JavaLocation location=frame.getLocation(); JavaMethod method=location.getMethod(); @@ -149,7 +149,7 @@ private List getThreads() { JavaRuntime runtime=getJavaRuntime(); - Iterator threadIterator=runtime.getThreads(); + Iterator threadIterator=runtime.getThreads().iterator(); List allThreads=new LinkedList(); @@ -163,7 +163,7 @@ public void testThreadGroupMembership() throws CorruptDataException { - List allThreads = getThreads(); + List allThreads = getJavaRuntime().getThreads(); JavaThread t1=getThread(allThreads, DTFJ_TCK_T1); Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getCompiledMethods.java Fri Jul 10 23:07:20 2009 @@ -15,9 +15,9 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.java.JavaMethod; -import org.apache.kato.java.JavaRuntime; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.java.JavaMethod; +import javax.tools.diagnostics.java.JavaRuntime; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -41,14 +41,14 @@ public void testHasCompiledMethods() { JavaRuntime runtime=getJavaRuntime(); - Iterator compiledMethods=runtime.getCompiledMethods(); + Iterator compiledMethods=runtime.getCompiledMethods().iterator(); assertNotNull(compiledMethods); assertTrue(compiledMethods.hasNext()); } public void testConfiguredCompiledMethods() { JavaRuntime runtime=getJavaRuntime(); - Iterator compiledMethods=runtime.getCompiledMethods(); + Iterator compiledMethods=runtime.getCompiledMethods().iterator(); boolean found = false; while (compiledMethods.hasNext() && !found) { Object next = compiledMethods.next(); Modified: incubator/kato/branches/experimental/maven_restructure/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/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java Fri Jul 10 23:07:20 2009 @@ -20,17 +20,17 @@ import java.util.Map; import java.util.Set; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.image.DataUnavailable; -import org.apache.kato.image.MemoryAccessException; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaClassLoader; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaReference; -import org.apache.kato.java.JavaRuntime; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.image.DataUnavailable; +import javax.tools.diagnostics.image.MemoryAccessException; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaClassLoader; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaReference; +import javax.tools.diagnostics.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.api.ICheckpoint; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -264,7 +264,7 @@ JavaField countField = null; JavaField valueField = null; - Iterator fields = javaLangString.getDeclaredFields(); + Iterator fields = javaLangString.getDeclaredFields().iterator(); while (fields.hasNext()) { Object next = fields.next(); if (next instanceof JavaField) { @@ -338,7 +338,7 @@ private Map getRootsCheckList() { JavaRuntime runtime = getJavaRuntime(); Map rootsCheckList = new HashMap(); - Iterator roots = runtime.getHeapRoots(); + Iterator roots = runtime.getHeapRoots().iterator(); while (roots.hasNext()) { Object next = roots.next(); if (next instanceof CorruptData) { @@ -363,7 +363,7 @@ // need to ignore primitive types private boolean checkSystemClasses(Map rootsCheckList) { JavaClassLoader systemClassLoader = getBootClassLoader(); - Iterator systemClasses = systemClassLoader.getDefinedClasses(); + Iterator systemClasses = systemClassLoader.getDefinedClasses().iterator(); boolean passed = true; String systemClassName = null; while (systemClasses.hasNext()) { @@ -460,7 +460,7 @@ JavaThread thread = null; // Find the thread to match as a root source. - Iterator threads = getJavaRuntime().getThreads(); + Iterator threads = getJavaRuntime().getThreads().iterator(); while(threads.hasNext()) { JavaThread candidateThread = (JavaThread) threads.next(); if (javaLocalRootsthreadName.equals(candidateThread.getName())) { @@ -479,7 +479,7 @@ // Find all JavaObject heaproots that have our test thread as a source // Remove their class names from our set of expected names. - Iterator rootIterator = getJavaRuntime().getHeapRoots(); + Iterator rootIterator = getJavaRuntime().getHeapRoots().iterator(); while(rootIterator.hasNext()) { JavaReference reference = (JavaReference) rootIterator.next(); Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java Fri Jul 10 23:07:20 2009 @@ -18,16 +18,16 @@ import java.util.Iterator; import java.util.Map; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.image.DataUnavailable; -import org.apache.kato.java.JavaClass; -import org.apache.kato.java.JavaLocation; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaReference; -import org.apache.kato.java.JavaRuntime; -import org.apache.kato.java.JavaStackFrame; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.image.DataUnavailable; +import javax.tools.diagnostics.java.JavaClass; +import javax.tools.diagnostics.java.JavaLocation; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaReference; +import javax.tools.diagnostics.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaStackFrame; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.api.ICheckpoint; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; import org.apache.kato.tck.tests.javaruntime.TestJavaRuntime_getHeapRoots.HeapRoot; @@ -53,7 +53,7 @@ public void setUp () { JavaRuntime runtime = getJavaRuntime(); - Iterator threads = runtime.getThreads(); + Iterator threads = runtime.getThreads().iterator(); JavaThread contrivedThread = null; while (threads.hasNext()) { Object next = threads.next(); @@ -78,7 +78,7 @@ fail("Couldn't find thread "+threadName); } - Iterator frames = contrivedThread.getStackFrames(); + Iterator frames = contrivedThread.getStackFrames().iterator(); JavaStackFrame currentFrame = null; while (frames.hasNext() && frame == null) { Object next = frames.next(); @@ -102,7 +102,7 @@ fail("Couldn't find stack frame for methodA"); } - Iterator roots = frame.getHeapRoots(); + Iterator roots = frame.getHeapRoots().iterator(); while (roots.hasNext()) { Object next = roots.next(); if (next instanceof CorruptData) { Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java Fri Jul 10 23:07:20 2009 @@ -15,11 +15,11 @@ import java.util.Iterator; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.image.MemoryAccessException; -import org.apache.kato.java.JavaField; -import org.apache.kato.java.JavaObject; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.image.MemoryAccessException; +import javax.tools.diagnostics.java.JavaField; +import javax.tools.diagnostics.java.JavaObject; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.api.ICheckpoint; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -68,7 +68,7 @@ assertNotNull(thisTestInstanceInDump); - Iterator i=thisTestInstanceInDump.getJavaClass().getDeclaredFields(); + Iterator i=thisTestInstanceInDump.getJavaClass().getDeclaredFields().iterator(); assertNotNull("declared fields iterator is null",i); while(i.hasNext()) { Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java?rev=793142&r1=793141&r2=793142&view=diff ============================================================================== --- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java (original) +++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java Fri Jul 10 23:07:20 2009 @@ -16,10 +16,10 @@ import java.util.Hashtable; import java.util.Iterator; -import org.apache.kato.image.CorruptData; -import org.apache.kato.image.CorruptDataException; -import org.apache.kato.java.JavaRuntime; -import org.apache.kato.java.JavaThread; +import javax.tools.diagnostics.image.CorruptData; +import javax.tools.diagnostics.image.CorruptDataException; +import javax.tools.diagnostics.java.JavaRuntime; +import javax.tools.diagnostics.java.JavaThread; import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase; @@ -62,7 +62,7 @@ JavaRuntime runtime=getJavaRuntime(); - Iterator threads = runtime.getThreads(); + Iterator threads = runtime.getThreads().iterator(); while (threads.hasNext()) { Object next = threads.next();