You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/11/23 12:59:26 UTC

svn commit: r883326 [2/2] - in /incubator/kato/trunk/org.apache.kato: kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/ kato.tck/ kato.tck/src/test/ant/

Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java?rev=883326&r1=883325&r2=883326&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java Mon Nov 23 12:59:24 2009
@@ -29,9 +29,9 @@
 public class TestJavaMethod_getName extends TCKJavaRuntimeTestcase {
 	
 	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	public JavaObject getScenerioReference() {
 		if (thisObject == null) {
-			thisObject = super.getThis();
+			thisObject = super.getScenerioReference();
 		}	
 		return thisObject;		
 	}
@@ -42,7 +42,7 @@
 	 * @throws Exception
 	 */
 	public void testGetDeclaredMethods() throws Exception {
-		JavaClass thisClass = getThis().getJavaClass();
+		JavaClass thisClass = getScenerioReference().getJavaClass();
 		
 		assertNotNull("Unable to find this class", thisClass);
 		

Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java?rev=883326&r1=883325&r2=883326&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getReferences.java Mon Nov 23 12:59:24 2009
@@ -29,7 +29,7 @@
 
 	public void testMultiDimensionalArrayReferences() {
 		try {
-			JavaObject thisObject = getThis();
+			JavaObject thisObject = getScenerioReference();
 			JavaField multiDimArrayField = getJavaField(thisObject, "multiDimArray");
 			Object multiDimArrayObject = multiDimArrayField.get(thisObject);
 			if (multiDimArrayObject instanceof JavaObject) {

Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java?rev=883326&r1=883325&r2=883326&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaReferences.java Mon Nov 23 12:59:24 2009
@@ -27,7 +27,7 @@
 	
 	
 	public void testReferences_getDescription() {
-		JavaObject thisObj = getThis();
+		JavaObject thisObj = getScenerioReference();
 		Iterator references = thisObj.getReferences().iterator();
 		
 		while (references.hasNext()) {
@@ -41,7 +41,7 @@
 	}
 
 	public void testReferences_getReachability() throws Exception {
-		JavaObject thisObj = getThis();
+		JavaObject thisObj = getScenerioReference();
 		Iterator references = thisObj.getReferences().iterator();
 		
 		while (references.hasNext()) {
@@ -75,7 +75,7 @@
 	}
 	
 	public void testReferences_isClassReference() throws Exception {
-		JavaObject thisObj = getThis();
+		JavaObject thisObj = getScenerioReference();
 		Iterator references = thisObj.getReferences().iterator();
 		
 		while (references.hasNext()) {
@@ -93,7 +93,7 @@
 	}
 	
 	public void testReferences_isObjectReference() throws Exception {
-		JavaObject thisObj = getThis();
+		JavaObject thisObj = getScenerioReference();
 		Iterator references = thisObj.getReferences().iterator();
 		
 		while (references.hasNext()) {
@@ -111,7 +111,7 @@
 	}
 	
 	public void testReferences_getReferenceType() throws Exception {
-		JavaObject thisObj = getThis();
+		JavaObject thisObj = getScenerioReference();
 		Iterator references = thisObj.getReferences().iterator();
 		
 		while (references.hasNext()) {

Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java?rev=883326&r1=883325&r2=883326&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThreadInspection.java Mon Nov 23 12:59:24 2009
@@ -41,7 +41,7 @@
 	 */
 	public void setUp() throws CorruptDataException, MemoryAccessException {
 				
-		JavaObject thisTestInstanceInDump=getThis();
+		JavaObject thisTestInstanceInDump=getScenerioReference();
 		assertNotNull(thisTestInstanceInDump);
 		
 		

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml?rev=883326&r1=883325&r2=883326&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml Mon Nov 23 12:59:24 2009
@@ -191,6 +191,11 @@
 						<artifactId>kato.tck.testsuite</artifactId>
 						<version>M1-incubating</version>
 					</dependency>
+					<dependency>
+						<groupId>org.apache.kato</groupId>
+						<artifactId>kato.cjvmti</artifactId>
+						<version>M1-incubating</version>
+					</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml?rev=883326&r1=883325&r2=883326&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml Mon Nov 23 12:59:24 2009
@@ -25,7 +25,7 @@
 		
 		<!-- create the scenario and cause a cjvmti dump -->
 		
-		<tcksetup>
+		<tcksetup dir="${target}">
 			<classpath path="${path}" />
 			<scenario name="142"/>
 			<jvmarg value="-agentpath:${cjvmti.agent.path}"/>
@@ -35,7 +35,7 @@
 		<!-- run the tck testsuite -->
 		
 		<junit>
-			<sysproperty key="org.apache.kato.dumppath" value="foo"/>
+			<sysproperty key="org.apache.kato.dumppath" value="${target}/cjvmtiV0.cdmp"/>
 			<formatter type="plain"/>
 			<formatter type="xml"/>
 			<test name="org.apache.kato.tck.tests.javaruntime.AllJavaRuntimeTests" todir="${target}"/>