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/04 14:02:42 UTC
svn commit: r832746 - in /incubator/kato/trunk/org.apache.kato: ./
kato.tck.harness/ kato.tck.harness/.settings/
kato.tck.harness/src/main/java/org/apache/kato/tck/api/
kato.tck.testsuite.scenario.common/
kato.tck.testsuite/src/main/java/org/apache/kat...
Author: spoole
Date: Wed Nov 4 14:02:40 2009
New Revision: 832746
URL: http://svn.apache.org/viewvc?rev=832746&view=rev
Log:
moved scenario classes to new package name
Modified:
incubator/kato/trunk/org.apache.kato/kato.tck.harness/.classpath
incubator/kato/trunk/org.apache.kato/kato.tck.harness/.settings/org.eclipse.jdt.core.prefs
incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/ICheckPointHandler.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.common/pom.xml
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java
incubator/kato/trunk/org.apache.kato/pom.xml
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/.classpath?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/.classpath (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/.classpath Wed Nov 4 14:02:40 2009
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/.settings/org.eclipse.jdt.core.prefs?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/.settings/org.eclipse.jdt.core.prefs Wed Nov 4 14:02:40 2009
@@ -1,5 +1,5 @@
-#Tue Jun 16 16:30:29 BST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
+#Wed Nov 04 10:02:15 GMT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.source=1.4
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/ICheckPointHandler.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/ICheckPointHandler.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/ICheckPointHandler.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/ICheckPointHandler.java Wed Nov 4 14:02:40 2009
@@ -20,7 +20,7 @@
public interface ICheckPointHandler {
- public void handle(Method method,AbstractTCKTestcase testcase);
+ public void handle(Method method,IScenarioElement testcase);
public void checkpoint(Method method);
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.common/pom.xml?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.common/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.common/pom.xml Wed Nov 4 14:02:40 2009
@@ -6,10 +6,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.kato</groupId>
- <artifactId>kato.tck.testsuite.scenario.common</artifactId>
- <name>TCK testsuite scenario </name>
+ <artifactId>kato.tck.testsuite.scenario.142</artifactId>
+ <name>TCK testsuite scenario 1.4.2 </name>
<version>0.0.1-SNAPSHOT</version>
- <description>Common scenario setup for TCK. Used to create an example system </description>
+ <description>Scenario setup for TCK. Used to create an example system suitable for running on a 1.4.2 JVM</description>
<build>
<plugins>
<plugin>
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java Wed Nov 4 14:02:40 2009
@@ -23,7 +23,7 @@
import javax.tools.diagnostics.runtime.java.JavaRuntime;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaClass_getName;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaClass_getName;
public class TestJavaClass_getName extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_equals;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_equals;
public class TestJavaField_equals extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_get;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_get;
public class TestJavaField_get extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getBoolean;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getBoolean;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getByte;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getByte;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getChar;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getChar;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java Wed Nov 4 14:02:40 2009
@@ -18,7 +18,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getDeclaringClass;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getDeclaringClass;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getDouble;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getDouble;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getFloat;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getFloat;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getInt;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getInt;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getLong;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getLong;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java Wed Nov 4 14:02:40 2009
@@ -19,7 +19,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getModifiers;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getModifiers;
public class TestJavaField_getModifiers extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getName;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getName;
public class TestJavaField_getName extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getShort;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getShort;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java Wed Nov 4 14:02:40 2009
@@ -17,7 +17,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getSignature;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getSignature;
public class TestJavaField_getSignature extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java Wed Nov 4 14:02:40 2009
@@ -19,7 +19,7 @@
import javax.tools.diagnostics.runtime.java.JavaObject;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaField_getString;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaField_getString;
public class TestJavaField_getString extends TCKJavaRuntimeTestcase {
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=832746&r1=832745&r2=832746&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 Wed Nov 4 14:02:40 2009
@@ -23,7 +23,7 @@
import javax.tools.diagnostics.runtime.java.JavaThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaMethod_getName;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaMethod_getName;
public class TestJavaMethod_getName extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMonitor_ObjectMonitors.java Wed Nov 4 14:02:40 2009
@@ -28,8 +28,8 @@
import javax.tools.diagnostics.runtime.java.JavaThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.TODOJavaMonitor_ObjectMonitors;
-import org.apache.kato.tck.setup.javaruntime.TODOJavaMonitor_ObjectMonitors.MonitorThreadConfig;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaMonitor_ObjectMonitors;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaMonitor_ObjectMonitors.MonitorThreadConfig;
/**
@@ -44,20 +44,20 @@
public class TestJavaMonitor_ObjectMonitors extends TCKJavaRuntimeTestcase {
- public TODOJavaMonitor_ObjectMonitors setup=new TODOJavaMonitor_ObjectMonitors();
+ public SetupJavaMonitor_ObjectMonitors setup=new SetupJavaMonitor_ObjectMonitors();
/**
* Not executed anywhere - for debugging
*/
- public void printMonitors() {
+ private void printMonitors() {
System.out.println("JVM "+ System.getProperty("java.vm.name")+ ", "+System.getProperty("java.vm.vendor")+
System.getProperty("java.vm.version"));
- for (int i = 0; i < monitorConfigs.length; i++) {
- System.out.println("Printing out status of "+ monitorConfigs[i].id);
+ for (int i = 0; i < setup.monitorConfigs.length; i++) {
+ System.out.println("Printing out status of "+ setup.monitorConfigs[i].id);
System.out.println("==================================");
- JavaMonitor monitor = monitorConfigs[i].getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.monitorConfigs[i].getMonitor();
if (monitor == null) {
System.out.println("monitor = null");
@@ -147,7 +147,7 @@
private static String generatePrefix(int waiters, int enters, int owners) {
- return TODOJavaMonitor_ObjectMonitors.namePrefix + waiters + "-" + owners + "-" + enters;
+ return SetupJavaMonitor_ObjectMonitors.namePrefix + waiters + "-" + owners + "-" + enters;
}
@@ -326,7 +326,7 @@
if (monitorObjectCandidate != null) {
JavaClass monitorClass = monitorObjectCandidate.getJavaClass();
- if (!TODOJavaMonitor_ObjectMonitors.monitorClassName.equals(monitorClass.getName())) {
+ if (!SetupJavaMonitor_ObjectMonitors.monitorClassName.equals(monitorClass.getName())) {
continue;
}
@@ -360,25 +360,25 @@
}
public void testFindMonitor_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
assertNotNull("Couldn't find 0-1-1", monitor);
}
public void testGetID_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 0-1-1 is null.", monitor.getID());
}
public void testGetName_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 0-1-1 is null.", monitor
.getName());
}
public void testCountWaiters_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -391,7 +391,7 @@
}
public void testCountEnters_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -404,21 +404,21 @@
}
public void testCountOwners_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(0, 1, 1)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
@@ -427,48 +427,48 @@
}
public void testNameEnters_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
JavaThread next = (JavaThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(0, 1, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
count++;
}
}
public void testNameOwners_0_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 1, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(0, 1, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
}
///////////////////////////////////////////
public void testFindMonitor_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor) setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
assertNotNull("Couldn't find 0-1-1", monitor);
}
public void testGetID_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 0-1-1 is null.", monitor.getID());
}
public void testGetName_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 0-1-1 is null.", monitor
.getName());
}
public void testCountWaiters_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -481,7 +481,7 @@
}
public void testCountEnters_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -494,21 +494,21 @@
}
public void testCountOwners_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(0, 0, 1)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
@@ -516,48 +516,48 @@
}
public void testNameEnters_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
JavaThread next = (JavaThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(0, 0, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
count++;
}
}
public void testNameOwners_0_0_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 0, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(0, 0, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
}
///////////////////////////////////////////
public void testFindMonitor_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
assertNotNull("Couldn't find monitor 1-0-0", monitor);
}
public void testGetID_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getID() for 1-0-0 is null.", monitor.getID());
}
public void testGetName_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getName() for 1-0-0 is null.", monitor
.getName());
}
public void testCountWaiters_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -570,7 +570,7 @@
}
public void testCountEnters_1_0_0() throws Exception {
- JavaMonitor monitor =setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor =(JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -583,35 +583,35 @@
}
public void testCountOwners_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
JavaThread owner = monitor.getOwner();
assertNull("Owner count incorrect", owner);
}
public void testNameWaiters_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(1, 0, 0)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
}
public void testNameEnters_1_0_0() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
JavaThread next = (JavaThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(1, 0, 0) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
count++;
}
}
@@ -619,25 +619,25 @@
///////////////////////////////////////////
public void testFindMonitor_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor =(JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
assertNotNull("Couldn't find monitor 1-1-1", monitor);
}
public void testGetID_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 1-1-1 is null.", monitor.getID());
}
public void testGetName_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 1-1-1 is null.", monitor
.getName());
}
public void testCountWaiters_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -650,7 +650,7 @@
}
public void testCountEnters_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
enters = monitor.getEnterWaiters().iterator();
@@ -664,14 +664,14 @@
}
public void testCountOwners_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_1_1_1() throws Exception {
- JavaMonitor monitor = setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -682,55 +682,55 @@
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(1, 1, 1)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
}
public void testNameEnters_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
JavaThread next = (JavaThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(1, 1, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
count++;
}
}
public void testNameOwners_1_1_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 1, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 1, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(1, 1, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
}
//////////////////////////////////////////////
public void testFindMonitor_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
assertNotNull("Couldn't find monitor 2-0-0", monitor);
}
public void testGetID_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getID() for 2-0-0 is null.", monitor.getID());
}
public void testGetName_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
assertNotNull("JavaMonitor.getName() for 2-0-0 is null.", monitor
.getName());
}
public void testCountWaiters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -743,7 +743,7 @@
}
public void testCountEnters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -756,60 +756,60 @@
}
public void testCountOwners_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
JavaThread owner = monitor.getOwner();
assertNull("Owner count incorrect", owner);
}
public void testNameWaiters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(2, 0, 0)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
}
public void testNameEnters_2_0_0() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 0, 0).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 0, 0).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
JavaThread next = (JavaThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(2, 0, 0) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
count++;
}
}
///////////////////////////////////////////
public void testFindMonitor_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
assertNotNull("Couldn't find monitor 1-0-1", monitor);
}
public void testGetID_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 1-0-1 is null.", monitor.getID());
}
public void testGetName_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 1-0-1 is null.", monitor
.getName());
}
public void testCountWaiters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -822,7 +822,7 @@
}
public void testCountEnters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -835,68 +835,68 @@
}
public void testCountOwners_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(1, 0, 1)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
}
public void testNameEnters_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
while (enters.hasNext()) {
JavaThread next = (JavaThread) enters.next();
assertEquals("Enters name incorrect", generatePrefix(1, 0, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName + "-" + count, next.getName());
count++;
}
}
public void testNameOwners_1_0_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(1, 0, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(1, 0, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(1, 0, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
}
///////////////////////////////////////////
public void testFindMonitor_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
assertNotNull("Couldn't find monitor 0-2-1", monitor);
}
public void testGetID_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 0-2-1 is null.", monitor.getID());
}
public void testGetName_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 0-2-1 is null.", monitor
.getName());
}
public void testCountWaiters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -909,7 +909,7 @@
}
public void testCountEnters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -922,66 +922,66 @@
}
public void testCountOwners_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
while (waiters.hasNext()) {
JavaThread next = (JavaThread) waiters.next();
assertEquals("Waiters name incorrect", generatePrefix(0, 2, 1)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName + "-" + count, next
.getName());
count++;
}
}
public void testNameEnters_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
Iterator enters = monitor.getEnterWaiters().iterator();
String error = checkNames(enters, generatePrefix(0, 2, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName, 2);
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName, 2);
assertNull(error, error);
}
public void testNameOwners_0_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(0, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(0, 2, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(0, 2, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
}
///////////////////////////////////////////
public void testFindMonitor_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
assertNotNull("Couldn't find monitor 2-2-1", monitor);
}
public void testGetID_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getID() for 2-2-1 is null.", monitor.getID());
}
public void testGetName_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
assertNotNull("JavaMonitor.getName() for 2-2-1 is null.", monitor
.getName());
}
public void testCountWaiters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
int count = 0;
Iterator waiters = monitor.getNotifyWaiters().iterator();
@@ -994,7 +994,7 @@
}
public void testCountEnters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
int count = 0;
Iterator enters = monitor.getEnterWaiters().iterator();
@@ -1007,37 +1007,37 @@
}
public void testCountOwners_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertNotNull("Owner count incorrect", owner);
}
public void testNameWaiters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
Iterator waiters = monitor.getNotifyWaiters().iterator();
String error = checkNames(waiters, generatePrefix(2, 2, 1)
- + "-" + TODOJavaMonitor_ObjectMonitors.monitorNotifyThreadName , 2);
+ + "-" + SetupJavaMonitor_ObjectMonitors.monitorNotifyThreadName , 2);
assertNull(error, error);
}
public void testNameEnters_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
Iterator enters = monitor.getEnterWaiters().iterator();
String error = checkNames(enters, generatePrefix(2, 2, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorEnterThreadName, 2);
+ + SetupJavaMonitor_ObjectMonitors.monitorEnterThreadName, 2);
assertNull(error, error);
}
public void testNameOwners_2_2_1() throws Exception {
- JavaMonitor monitor = findMonitorThreadConfig(2, 2, 1).getMonitor();
+ JavaMonitor monitor = (JavaMonitor)setup.findMonitorThreadConfig(2, 2, 1).getMonitor();
JavaThread owner = monitor.getOwner();
assertEquals("Owner name incorrect", generatePrefix(2, 2, 1) + "-"
- + TODOJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
+ + SetupJavaMonitor_ObjectMonitors.monitorOwnerThreadName + "-0", owner.getName());
}
////////////////////////////////////
@@ -1047,14 +1047,15 @@
*
*/
public void testGetID() throws Exception {
- Set foundSet = new HashSet(NUM_MONITORS);
+ Set foundSet = new HashSet(SetupJavaMonitor_ObjectMonitors.NUM_MONITORS);
- for (int i=0; i < NUM_MONITORS; i++){
- ImagePointer id = monitorConfigs[i].monitor.getID();
+ for (int i=0; i < SetupJavaMonitor_ObjectMonitors.NUM_MONITORS; i++){
+ JavaMonitor monitor=(JavaMonitor) setup.monitorConfigs[i].monitor;
+ ImagePointer id = monitor.getID();
- assertNotNull("Found null monitor id for " + monitorConfigs[i].id, id);
+ assertNotNull("Found null monitor id for " + setup.monitorConfigs[i].id, id);
- assertFalse("Found duplicate monitor id. " + monitorConfigs[i].id, foundSet.contains(id));
+ assertFalse("Found duplicate monitor id. " + setup.monitorConfigs[i].id, foundSet.contains(id));
foundSet.add(id);
}
@@ -1063,36 +1064,38 @@
////////////////////////////////////
public void testGetName() throws Exception {
- for (int i=0; i < NUM_MONITORS; i++){
- String name = monitorConfigs[i].monitor.getName();
+ for (int i=0; i < SetupJavaMonitor_ObjectMonitors.NUM_MONITORS; i++){
+ JavaMonitor monitor=(JavaMonitor) setup.monitorConfigs[i].monitor;
+ String name = monitor.getName();
- assertNotNull("Found null monitor name for " + monitorConfigs[i].id, name);
+ assertNotNull("Found null monitor name for " + setup.monitorConfigs[i].id, name);
}
}
public void testGetObject() throws Exception {
- for (int i=0; i < NUM_MONITORS; i++){
- JavaObject object = monitorConfigs[i].monitor.getObject();
+ for (int i=0; i < SetupJavaMonitor_ObjectMonitors.NUM_MONITORS; i++){
+ JavaMonitor monitor=(JavaMonitor) setup.monitorConfigs[i].monitor;
+ JavaObject object = monitor.getObject();
- assertEquals("Monitor object class unexpected name.",monitorClassName, object.getJavaClass().getName());
+ assertEquals("Monitor object class unexpected name.",setup.monitorClassName, object.getJavaClass().getName());
JavaField idField = getJavaField(object, "id");
String idString = idField.getString(object);
- assertEquals("MonitorClass id strings didn't match.", monitorConfigs[i].id, idString);
+ assertEquals("MonitorClass id strings didn't match.", setup.monitorConfigs[i].id, idString);
}
}
public void testEqualsSelf() throws Exception {
- assertTrue(monitorConfigs[0].monitor.equals(monitorConfigs[0].monitor));
+ assertTrue(setup.monitorConfigs[0].monitor.equals(setup.monitorConfigs[0].monitor));
}
public void testEqualsNull() throws Exception {
- assertFalse(monitorConfigs[0].monitor.equals(null));
+ assertFalse(setup.monitorConfigs[0].monitor.equals(null));
}
public void testNotEqualsOther() throws Exception {
- assertFalse(monitorConfigs[0].monitor.equals(monitorConfigs[1].monitor));
+ assertFalse(setup.monitorConfigs[0].monitor.equals(setup.monitorConfigs[1].monitor));
}
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_arraycopy.java Wed Nov 4 14:02:40 2009
@@ -25,8 +25,8 @@
import javax.tools.diagnostics.runtime.java.JavaRuntime;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaObject_arraycopy;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaObject_arraycopy.TestArrays;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaObject_arraycopy;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaObject_arraycopy.TestArrays;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaObject_getDeclaredFields_getName.java Wed Nov 4 14:02:40 2009
@@ -24,7 +24,7 @@
import javax.tools.diagnostics.runtime.java.JavaRuntime;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaObject_getDeclaredFields_getName;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaObject_getDeclaredFields_getName;
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime.java Wed Nov 4 14:02:40 2009
@@ -22,7 +22,7 @@
import javax.tools.diagnostics.runtime.java.JavaVMOption;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaRuntime;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaRuntime;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntimeThreads.java Wed Nov 4 14:02:40 2009
@@ -25,7 +25,7 @@
import javax.tools.diagnostics.runtime.java.JavaThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaRuntimeThreads;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaRuntimeThreads;
/**
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaRuntime_getHeapRoots.java Wed Nov 4 14:02:40 2009
@@ -33,8 +33,8 @@
import javax.tools.diagnostics.runtime.java.JavaThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaRuntime_getHeapRoots;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaRuntime_getHeapRoots.HeapRoot;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaRuntime_getHeapRoots;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaRuntime_getHeapRoots.HeapRoot;
import org.apache.kato.tck.tests.javaruntime.TestJavaStackFrame_getHeapRoots.HeapRootsTestLocalVariable;
import org.apache.kato.tck.tests.javaruntime.TestJavaStackFrame_getHeapRoots.HeapRootsTestParam;
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaStackFrame_getHeapRoots.java Wed Nov 4 14:02:40 2009
@@ -31,7 +31,7 @@
import org.apache.kato.tck.api.ICheckpoint;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaRuntime_getHeapRoots.HeapRoot;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaRuntime_getHeapRoots.HeapRoot;
Modified: incubator/kato/trunk/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/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getName.java Wed Nov 4 14:02:40 2009
@@ -21,7 +21,7 @@
import javax.tools.diagnostics.runtime.java.JavaThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaThread_getName;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaThread_getName;
public class TestJavaThread_getName extends TCKJavaRuntimeTestcase {
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.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/TestJavaThread_getStackFrames.java?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaThread_getStackFrames.java Wed Nov 4 14:02:40 2009
@@ -22,7 +22,7 @@
import javax.tools.diagnostics.runtime.java.JavaThread;
import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
-import org.apache.kato.tck.setup.javaruntime.SetupJavaThread_getStackFrames;
+import org.apache.kato.tck.scenario.common.javaruntime.SetupJavaThread_getStackFrames;
/**
Modified: incubator/kato/trunk/org.apache.kato/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/pom.xml?rev=832746&r1=832745&r2=832746&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/pom.xml Wed Nov 4 14:02:40 2009
@@ -24,7 +24,7 @@
<module>kato.tck.harness</module>
<module>kato.tck.testsuite</module>
- <module>kato.tck.testsuite.scenario.common</module>
+ <module>kato.tck.testsuite.scenario.142</module>
<module>kato.docs</module>
<module>kato.common</module>