incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r793142 [3/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 GMT
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaLocationTest.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/tests/junit/JavaLocationTest.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/tests/junit/JavaLocationTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaLocationTest.java
Fri Jul 10 23:07:20 2009
@@ -13,11 +13,11 @@
  ******************************************************************************/
 package org.apache.kato.tests.junit;
 
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.java.JavaLocation;
-import org.apache.kato.java.JavaStackFrame;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.java.JavaLocation;
+import javax.tools.diagnostics.java.JavaStackFrame;
 
 public class JavaLocationTest extends AbstractDTFJTestcase
 {
@@ -26,7 +26,7 @@
 	public  JavaLocation defaultLocation()
 	{
 		try {
-			return ((JavaStackFrame)defaultJavaThread().getStackFrames().next()).getLocation();
+			return ((JavaStackFrame)defaultJavaThread().getStackFrames().get(0)).getLocation();
 		} catch (CorruptDataException e) {
 			//XXX: how should this be handled?
 			throw new TestNotImplementedException();
@@ -40,7 +40,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaLocation.getAddress()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaLocation.getAddress()'
 	 * 
 	 * Ensures that the address is non-null
 	 */
@@ -55,7 +55,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaLocation.getLineNumber()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaLocation.getLineNumber()'
 	 * 
 	 * Ensures that the line number is >0
 	 */
@@ -71,7 +71,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaLocation.getFilename()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaLocation.getFilename()'
 	 * 
 	 * Ensures that the filename is non-null and non-empty
 	 */
@@ -89,7 +89,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaLocation.getCompilationLevel()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaLocation.getCompilationLevel()'
 	 * 
 	 * Ensures that the call succeeds
 	 */
@@ -103,7 +103,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaLocation.getMethod()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaLocation.getMethod()'
 	 * 
 	 * Ensures that a non-null method is returned
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.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/tests/junit/JavaMethodTest.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/tests/junit/JavaMethodTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.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.image.ImageSection;
-import org.apache.kato.java.JavaField;
-import org.apache.kato.java.JavaMethod;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.java.JavaField;
+import javax.tools.diagnostics.java.JavaMethod;
 
 
 public class JavaMethodTest extends AbstractDTFJTestcase
@@ -33,14 +33,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMethod.getBytecodeSections()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMethod.getBytecodeSections()'
 	 * 
 	 * Ensures that a non-null iterator is returned and every element of the iterator is ImageSection.
 	 * (note that the iterator can be empty in the case of natives)
 	 */
 	public void testGetBytecodeSections()
 	{
-		Iterator it = _method.getBytecodeSections();
+		Iterator it = _method.getBytecodeSections().iterator();
 		assertNotNull(it);
 		while (it.hasNext()) {
 			assertTrue(it.next() instanceof ImageSection);
@@ -48,19 +48,19 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMethod.getCompiledSections()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMethod.getCompiledSections()'
 	 * 
 	 * Ensures that a non-null, non-empty iterator is returned
 	 */
 	public void testGetCompiledSections()
 	{
-		Iterator it = _method.getCompiledSections();
+		Iterator it = _method.getCompiledSections().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMember.getModifiers()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMember.getModifiers()'
 	 * 
 	 * Ensures that the call succeeds
 	 */
@@ -73,7 +73,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMember.getDeclaringClass()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMember.getDeclaringClass()'
 	 * 
 	 * Ensures that the class has a non-null address
 	 */
@@ -87,7 +87,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMember.getName()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMember.getName()'
 	 * 
 	 * Ensure that the method has a non-empty name
 	 */
@@ -100,7 +100,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMember.getSignature()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMember.getSignature()'
 	 * 
 	 * Ensure that the signature is non-empty
 	 */

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMonitorTest.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/tests/junit/JavaMonitorTest.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/tests/junit/JavaMonitorTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaMonitorTest.java
Fri Jul 10 23:07:20 2009
@@ -15,10 +15,10 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.java.JavaMonitor;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.java.JavaMonitor;
+import javax.tools.diagnostics.java.JavaThread;
 
 
 public class JavaMonitorTest extends AbstractDTFJTestcase
@@ -27,7 +27,7 @@
 	
 	public  JavaMonitor defaultJavaMonitor()
 	{
-		Iterator it = defaultJavaRuntime().getMonitors();
+		Iterator it = defaultJavaRuntime().getMonitors().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		return (JavaMonitor) it.next();
@@ -40,7 +40,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMonitor.getObject()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMonitor.getObject()'
 	 * 
 	 * Ensures that no unexpected exceptions are thrown
 	 */
@@ -50,7 +50,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMonitor.getName()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMonitor.getName()'
 	 * 
 	 * Ensures that a non-null name is returned
 	 */
@@ -65,7 +65,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMonitor.getOwner()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMonitor.getOwner()'
 	 * 
 	 * Ensures that no unexpected exceptions are thrown
 	 */
@@ -79,14 +79,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMonitor.getEnterWaiters()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMonitor.getEnterWaiters()'
 	 * 
 	 * Ensures that either an empty iterator is returned, or a non-empty iterator where all
the 
 	 * elements are JavaThread of CorruptData is returned.
 	 */
 	public void testGetEnterWaiters()
 	{
-		Iterator iter = _monitor.getEnterWaiters();
+		Iterator iter = _monitor.getEnterWaiters().iterator();
 		assertNotNull(iter);
 		while (iter.hasNext()) {
 			Object element = iter.next();
@@ -95,14 +95,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMonitor.getNotifyWaiters()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMonitor.getNotifyWaiters()'
 	 * 
 	 * Ensures that either an empty iterator is returned, or a non-empty iterator where all
the 
 	 * elements are JavaThread of CorruptData is returned.
 	 */
 	public void testGetNotifyWaiters()
 	{
-		Iterator iter = _monitor.getNotifyWaiters();
+		Iterator iter = _monitor.getNotifyWaiters().iterator();
 		assertNotNull(iter);
 		while (iter.hasNext()) {
 			Object element = iter.next();
@@ -111,7 +111,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaMonitor.getID()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaMonitor.getID()'
 	 * 
 	 * Ensures that the pointer we receive is non-null.
 	 */
@@ -155,7 +155,7 @@
 	public void testAllMonitorOwners()
 	{
 		try {
-			Iterator it = defaultJavaRuntime().getMonitors();
+			Iterator it = defaultJavaRuntime().getMonitors().iterator();
 			
 			while (it.hasNext()) {
 				JavaMonitor monitor = (JavaMonitor) it.next();

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaObjectTest.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/tests/junit/JavaObjectTest.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/tests/junit/JavaObjectTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaObjectTest.java
Fri Jul 10 23:07:20 2009
@@ -15,14 +15,16 @@
 
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.List;
+
+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.JavaObject;
+import javax.tools.diagnostics.java.JavaReference;
 
-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.JavaObject;
-import org.apache.kato.java.JavaReference;
 import org.apache.kato.tck.api.ICheckpoint;
 
 
@@ -69,7 +71,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getJavaClass()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getJavaClass()'
 	 * 
 	 * Ensures that we get a class which has a name (that should imply that it is sane)
 	 */
@@ -90,7 +92,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.isArray()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.isArray()'
 	 * 
 	 * Ensures that this call returns something
 	 */
@@ -103,7 +105,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getArraySize()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getArraySize()'
 	 * 
 	 * Ensures that we only get specced behaviour for this call
 	 */
@@ -117,7 +119,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures that we can copy one element from a an array
 	 */
@@ -136,7 +138,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures that we can copy all the elements from an array
 	 */
@@ -155,7 +157,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures that we can copy most of the elements from an array
 	 */
@@ -174,7 +176,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures that we can copy most of the elements from an array
 	 */
@@ -194,7 +196,7 @@
 	
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures that we can copy most of the elements from an array
 	 */
@@ -213,7 +215,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures that we can copy most of the elements from an array
 	 */
@@ -232,7 +234,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures source index out of range is detected
 	 */
@@ -258,7 +260,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures source index out of range is detected (at the end)
 	 */
@@ -284,7 +286,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures source index out of range is detected
 	 */
@@ -310,7 +312,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures destination index out of range is detected
 	 */
@@ -337,7 +339,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures destination index out of range is detected
 	 */
@@ -363,7 +365,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures source index out of range is detected
 	 */
@@ -389,7 +391,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures negative length is detected
 	 */
@@ -415,7 +417,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures null destination is detected
 	 */
@@ -441,7 +443,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures bad destination is detected
 	 */
@@ -467,7 +469,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures out of range source index is detected
 	 */
@@ -493,7 +495,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures out of range destination index is detected
 	 */
@@ -519,7 +521,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.arraycopy(int, Object, int, int)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.arraycopy(int, Object, int,
int)'
 	 * 
 	 * Ensures out of range size is detected
 	 */
@@ -652,7 +654,7 @@
 	}
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getSize()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getSize()'
 	 * 
 	 * Ensures that a positive integer is returned
 	 */
@@ -665,7 +667,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getHashcode()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getHashcode()'
 	 * 
 	 * Ensures that the call succeeds
 	 */
@@ -679,7 +681,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getPersistentHashcode()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getPersistentHashcode()'
 	 * 
 	 * Ensures that the call succeeeds
 	 */
@@ -693,7 +695,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getID()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getID()'
 	 * 
 	 * Ensures that a non-zero pointer is returned
 	 */
@@ -703,7 +705,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getHeap()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getHeap()'
 	 * 
 	 * Ensures that a non-null heap is returned
 	 */
@@ -718,20 +720,20 @@
 
 	
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getSections()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getSections()'
 	 * 
 	 * Ensures that at least one section is in the returned iterator
 	 */
 	public void testGetSections()
 	{
-		Iterator sections = _object.getSections();
+		List sections = _object.getSections();
 		
 		assertNotNull(sections);
-		assertTrue(sections.hasNext());
+		assertFalse(sections.isEmpty());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaObject.getReferences()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaObject.getReferences()'
 	 * 
 	 * Ensures that the test object and test array object return non-null iterators, that any
elements
 	 * are either JavaReference or CorruptData, and that any JavaReference objects have a non-null

@@ -741,7 +743,7 @@
 	{
 		try {
 			// test references from a non-array object
-			Iterator references = _object.getReferences();
+			Iterator references = _object.getReferences().iterator();
 			assertNotNull(references);
 			while (references.hasNext()) {
 				Object instance = references.next();
@@ -755,7 +757,7 @@
 			}
 			
 			// test references from an array object
-			references = _array.getReferences();
+			references = _array.getReferences().iterator();
 			assertNotNull(references);
 			while (references.hasNext()) {
 				Object instance = references.next();

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaRuntimeTest.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/tests/junit/JavaRuntimeTest.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/tests/junit/JavaRuntimeTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaRuntimeTest.java
Fri Jul 10 23:07:20 2009
@@ -15,20 +15,20 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.image.DataUnavailable;
-import org.apache.kato.image.ImageAddressSpace;
-import org.apache.kato.image.ImagePointer;
-import org.apache.kato.image.ImageSection;
-import org.apache.kato.image.MemoryAccessException;
-import org.apache.kato.java.JavaHeap;
-import org.apache.kato.java.JavaMonitor;
-import org.apache.kato.java.JavaObject;
-import org.apache.kato.java.JavaReference;
-import org.apache.kato.java.JavaRuntime;
-import org.apache.kato.java.JavaVMInitArgs;
-import org.apache.kato.java.JavaVMOption;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.image.ImageAddressSpace;
+import javax.tools.diagnostics.image.ImagePointer;
+import javax.tools.diagnostics.image.ImageSection;
+import javax.tools.diagnostics.image.MemoryAccessException;
+import javax.tools.diagnostics.java.JavaHeap;
+import javax.tools.diagnostics.java.JavaMonitor;
+import javax.tools.diagnostics.java.JavaObject;
+import javax.tools.diagnostics.java.JavaReference;
+import javax.tools.diagnostics.java.JavaRuntime;
+import javax.tools.diagnostics.java.JavaVMInitArgs;
+import javax.tools.diagnostics.java.JavaVMOption;
 
 
 public class JavaRuntimeTest extends AbstractDTFJTestcase
@@ -42,7 +42,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getJavaVM()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getJavaVM()'
 	 * 
 	 * Ensure that the pointer exists
 	 */
@@ -59,14 +59,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getJavaClassLoaders()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getJavaClassLoaders()'
 	 * 
 	 * Ensures that there is at least one class loader in the VM
 	 */
 	public void testGetJavaClassLoaders()
 	{
 		try {
-			Iterator loaders = _runtime.getJavaClassLoaders();
+			Iterator loaders = _runtime.getJavaClassLoaders().iterator();
 			assertNotNull(loaders);
 			assertTrue(loaders.hasNext());
 		} catch (Exception e) {
@@ -76,7 +76,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getetObjectAtAddress()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getetObjectAtAddress()'
 	 * 
 	 * Ensures that every object in the heap is also accessible by address,
 	 * and that addresses outside the heap or not pointing to an object start
@@ -89,7 +89,7 @@
 		ImageAddressSpace addressSpace = defaultAddressSpace();
 		ImagePointer address=null;
 		ImagePointer unalignedAddress=null;
-		Iterator heapSections = heap.getSections();
+		Iterator heapSections = heap.getSections().iterator();
 
 
 		//determine the heap start and end address
@@ -119,7 +119,7 @@
 
 		//check that every object in the heap can be retrieved by address
 		boolean exception=false;
-		for (Iterator objects = heap.getObjects();objects.hasNext();) {
+		for (Iterator objects = heap.getObjects().iterator();objects.hasNext();) {
 			Object potentialObject = objects.next();
 			JavaObject object = null;
 			if (potentialObject instanceof JavaObject) {
@@ -179,14 +179,14 @@
 
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getThreads()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getThreads()'
 	 * 
 	 * Ensures that there is at least one known thread in the runtime
 	 */
 	public void testGetThreads()
 	{
 		try {
-			Iterator it = _runtime.getThreads();
+			Iterator it = _runtime.getThreads().iterator();
 			assertNotNull(it);
 			assertTrue(it.hasNext());
 		} catch (Exception e) {
@@ -196,14 +196,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getCompiledMethods()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getCompiledMethods()'
 	 * 
 	 * Ensures that the iterator is non-null
 	 */
 	public void testGetCompiledMethods()
 	{
 		try {
-			Iterator it = _runtime.getCompiledMethods();
+			Iterator it = _runtime.getCompiledMethods().iterator();
 			assertNotNull(it);
 		} catch (Exception e) {
 			//no exceptions should be thrown so catch it as a failure instead of an error
@@ -212,14 +212,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getMonitors()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getMonitors()'
 	 * 
 	 * Ensures that the iterator is non-null, has at least one element and it is a JavaMonitor
object.
 	 */
 	public void testGetMonitors()
 	{
 		try {
-			Iterator it = _runtime.getMonitors();
+			Iterator it = _runtime.getMonitors().iterator();
 			assertNotNull(it);
 			assertTrue(it.hasNext());
 			assertTrue(it.next() instanceof JavaMonitor);
@@ -230,14 +230,14 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getHeaps()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getHeaps()'
 	 * 
 	 * Ensures that the iterator is non-null, has at least one element and it is a JavaHeap
object.
 	 */
 	public void testGetHeaps()
 	{
 		try {
-			Iterator it = _runtime.getHeaps();
+			Iterator it = _runtime.getHeaps().iterator();
 			assertNotNull(it);
 			assertTrue(it.hasNext());
 			assertTrue(it.next() instanceof JavaHeap);
@@ -248,7 +248,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaRuntime.getTraceBuffer(String, boolean)'
+	 * Test method for 'javax.tools.diagnostics.java.JavaRuntime.getTraceBuffer(String, boolean)'
 	 * 
 	 * Ensure that something non-null comes back when we ask for the trace buffers
 	 */
@@ -293,7 +293,7 @@
 					|| (version == JavaVMInitArgs.JNI_VERSION_1_2)
 					|| (version == JavaVMInitArgs.JNI_VERSION_1_4));
 
-			Iterator options = args.getOptions();
+			Iterator options = args.getOptions().iterator();
 			assertNotNull(options);
 			
 			// make sure there's at least one option (not strictly required)
@@ -346,14 +346,14 @@
 	public void AtestWalkAllHeaps()
 	{
 		try {
-			Iterator it = _runtime.getHeaps();
+			Iterator it = _runtime.getHeaps().iterator();
 			assertNotNull(it);
 			assertTrue(it.hasNext());
 			while (it.hasNext()) {
 				Object next = it.next();
 				assertTrue(next instanceof JavaHeap);
 				JavaHeap heap = (JavaHeap) next;
-				Iterator objects = heap.getObjects();
+				Iterator objects = heap.getObjects().iterator();
 				assertNotNull(objects);
 				while (objects.hasNext()) {
 					Object one = objects.next();
@@ -374,7 +374,7 @@
 	public void testGetHeapRoots()
 	{
 
-		Iterator it = _runtime.getHeapRoots();
+		Iterator it = _runtime.getHeapRoots().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		Object first = it.next();

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaStackFrameTest.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/tests/junit/JavaStackFrameTest.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/tests/junit/JavaStackFrameTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaStackFrameTest.java
Fri Jul 10 23:07:20 2009
@@ -15,11 +15,11 @@
 
 import java.util.Iterator;
 
-import org.apache.kato.image.CorruptData;
-import org.apache.kato.image.CorruptDataException;
-import org.apache.kato.java.JavaReference;
-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.java.JavaReference;
+import javax.tools.diagnostics.java.JavaStackFrame;
+import javax.tools.diagnostics.java.JavaThread;
 
 
 public class JavaStackFrameTest extends AbstractDTFJTestcase
@@ -29,7 +29,7 @@
 	public  JavaStackFrame defaultJavaStackFrame()
 	{
 		JavaThread thread = defaultJavaThread();
-		Iterator it = thread.getStackFrames();
+		Iterator it = thread.getStackFrames().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		return (JavaStackFrame) it.next();
@@ -42,7 +42,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaStackFrame.getBasePointer()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaStackFrame.getBasePointer()'
 	 * 
 	 * Ensures that a non-null base pointer is returned
 	 */
@@ -56,7 +56,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaStackFrame.getLocation()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaStackFrame.getLocation()'
 	 * 
 	 * Ensures that a non-null location is returned
 	 */
@@ -99,7 +99,7 @@
 	public void testGetHeapRoots()
 	{
 		try {
-			Iterator it = _frame.getHeapRoots();
+			Iterator it = _frame.getHeapRoots().iterator();
 			assertNotNull(it);
 			/* some frames may legitimately not have any roots */
 			if (it.hasNext()){

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaThreadTest.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/tests/junit/JavaThreadTest.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/tests/junit/JavaThreadTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/JavaThreadTest.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.image.DataUnavailable;
-import org.apache.kato.java.JavaThread;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.image.DataUnavailable;
+import javax.tools.diagnostics.java.JavaThread;
 
 
 public class JavaThreadTest extends AbstractDTFJTestcase
@@ -34,7 +34,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaThread.getJNIEnv()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getJNIEnv()'
 	 * 
 	 * Ensures that the JNIEnv is non-null
 	 */
@@ -48,7 +48,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaThread.getPriority()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getPriority()'
 	 */
 	public void testGetPriority()
 	{
@@ -61,7 +61,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaThread.getObject()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getObject()'
 	 */
 	public void testGetObject()
 	{
@@ -74,7 +74,7 @@
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaThread.getState()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getState()'
 	 */
 	public void testGetState()
 	{
@@ -86,7 +86,7 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaThread.getImageThread()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getImageThread()'
 	 * 
 	 * Ensures that a non-null image thread can be pulled from this thread
 	 */
@@ -102,31 +102,31 @@
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaThread.getStackSections()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getStackSections()'
 	 * 
 	 * Ensures that a non-null, non-empty iterator is returned
 	 */
 	public void testGetStackSections()
 	{
-		Iterator it = _thread.getStackSections();
+		Iterator it = _thread.getStackSections().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 	}
 
 	/**
-	 * Test method for 'org.apache.kato.java.JavaThread.getStackFrames()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getStackFrames()'
 	 * 
 	 * Ensures that the frame iterator is non-null even though it may be empty
 	 */
 	public void testGetStackFrames()
 	{
-		Iterator frames = _thread.getStackFrames();
+		Iterator frames = _thread.getStackFrames().iterator();
 		assertNotNull(frames);
 		//it is legal for there to be no frames
 	}
 
 	/*
-	 * Test method for 'org.apache.kato.java.JavaThread.getName()'
+	 * Test method for 'javax.tools.diagnostics.java.JavaThread.getName()'
 	 */
 	public void testGetName()
 	{
@@ -171,7 +171,7 @@
 	 */
 	public void testAllThreadsNamed()
 	{
-		Iterator threads = defaultJavaRuntime().getThreads();
+		Iterator threads = defaultJavaRuntime().getThreads().iterator();
 		
 		while (threads.hasNext()) {
 			JavaThread thread = (JavaThread) threads.next();

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/TestNotImplementedException.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/tests/junit/TestNotImplementedException.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/tests/junit/TestNotImplementedException.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/TestNotImplementedException.java
Fri Jul 10 23:07:20 2009
@@ -25,6 +25,6 @@
 {
 	/**
 	 * 
-	 */
+	 */ 
 	private static final long serialVersionUID = 1L;
 }

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/TestPackageInformation.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/tests/junit/TestPackageInformation.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/tests/junit/TestPackageInformation.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/junit/TestPackageInformation.java
Fri Jul 10 23:07:20 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.tests.junit;
 
-import org.apache.kato.image.ImageFactory;
+import javax.tools.diagnostics.image.ImageFactory;
 
 import junit.framework.TestCase;
 

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/scenarios/ArrayletTest.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/tests/scenarios/ArrayletTest.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/tests/scenarios/ArrayletTest.java
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tests/scenarios/ArrayletTest.java
Fri Jul 10 23:07:20 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.apache.kato.tests.scenarios;
 
-public class ArrayletTest {
+public class ArrayletTest { 
 	public static volatile Thread a, b;
 	private static final int DTFJ_ARRAYLET_LENGTH = 7000;
 	private static ArrayletTestInstance DTFJ_ARRAYLET_TEST_INSTANCE  = new ArrayletTestInstance(DTFJ_ARRAYLET_LENGTH);;



Mime
View raw message