incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r890309 - in /incubator/kato/trunk/org.apache.kato/kato.tck: scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/ testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/
Date Mon, 14 Dec 2009 13:29:01 GMT
Author: spoole
Date: Mon Dec 14 13:29:00 2009
New Revision: 890309

URL: http://svn.apache.org/viewvc?rev=890309&view=rev
Log:
fixed a few mismatches between setup and execution for testsuite

Modified:
    incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaMethod_getName.java
    incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaStackFrame_getHeapRoots.java
    incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaReferences.java
    incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaRuntime_getHeapRoots.java
    incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaStackFrame_getHeapRoots.java

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaMethod_getName.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaMethod_getName.java?rev=890309&r1=890308&r2=890309&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaMethod_getName.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaMethod_getName.java
Mon Dec 14 13:29:00 2009
@@ -19,7 +19,7 @@
 
 public class SetupJavaMethod_getName extends ScenarioElement {
 	
-	public static final String threadName = "org.apache.kato.tck.tests.javaruntime.TestJavaMethod_getName#configure\u0412\u043e\u0434\u043a\u0430";
+	public static final String threadName = "org.apache.kato.tck.scenario142.javaruntime.SetupJavaMethod_getName#configure\u0412\u043e\u0434\u043a\u0430";
 
 	public static final String methodName = "configure\u0412\u043e\u0434\u043a\u0430";
 	

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaStackFrame_getHeapRoots.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaStackFrame_getHeapRoots.java?rev=890309&r1=890308&r2=890309&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaStackFrame_getHeapRoots.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/src/main/java/org/apache/kato/tck/scenario142/javaruntime/SetupJavaStackFrame_getHeapRoots.java
Mon Dec 14 13:29:00 2009
@@ -26,7 +26,7 @@
 	class HeapRootsTestParam {}
 	class HeapRootsTestLocalVariable {}
 
-	public static final String threadName = "org.apache.kato.tck.tests.javaruntime.TestJavaStackFrame_getHeapRoots#configureJavaLocalsRoots";
+	public static final String threadName = "org.apache.kato.tck.scenario142.javaruntime.SetupJavaStackFrame_getHeapRoots#configureJavaLocalsRoots";
 	private Map rootsCheckList = new HashMap();
 
 //	public String[] jvmDisableJIT()

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaReferences.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaReferences.java?rev=890309&r1=890308&r2=890309&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaReferences.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaReferences.java
Mon Dec 14 13:29:00 2009
@@ -188,7 +188,7 @@
 						fail("Target object for a CLASS reference not a JavaClass object.");
 					} 
 					JavaClass targetClass = (JavaClass)target;
-					assertTrue("Target class for the CLASS reference of this object different from expected.",
targetClass.getName().endsWith("TestJavaReferences"));
+					assertTrue("Target class for the CLASS reference of this object different from expected.",
targetClass.getName().endsWith("SetupJavaReferences"));
 					Iterator refs = targetClass.getReferences().iterator();
 					boolean classLoaderFound = false;
 					while (refs.hasNext()) {

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaRuntime_getHeapRoots.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaRuntime_getHeapRoots.java?rev=890309&r1=890308&r2=890309&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaRuntime_getHeapRoots.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaRuntime_getHeapRoots.java
Mon Dec 14 13:29:00 2009
@@ -35,8 +35,6 @@
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 import org.apache.kato.tck.scenario142.javaruntime.SetupJavaRuntime_getHeapRoots;
 import org.apache.kato.tck.scenario142.javaruntime.SetupJavaRuntime_getHeapRoots.HeapRoot;
-import org.apache.kato.tck.scenario142.javaruntime.TestJavaStackFrame_getHeapRoots.HeapRootsTestLocalVariable;
-import org.apache.kato.tck.scenario142.javaruntime.TestJavaStackFrame_getHeapRoots.HeapRootsTestParam;
 
 
 public class TestJavaRuntime_getHeapRoots extends TCKJavaRuntimeTestcase {
@@ -310,8 +308,8 @@
 		// Set up a set of JavaObject class names to look for.
 		Set roots = new HashSet();
 		
-		roots.add(HeapRootsTestLocalVariable.class.getName().replace('.', '/'));
-		roots.add(HeapRootsTestParam.class.getName().replace('.', '/'));
+		roots.add(SetupJavaStackFrame_getHeapRoots.HeapRootsTestLocalVariable.class.getName().replace('.',
'/'));
+		roots.add(SetupJavaStackFrame_getHeapRoots.HeapRootsTestParam.class.getName().replace('.',
'/'));
 		
 		// Find all JavaObject heaproots that have our test thread as a source
 		// Remove their class names from our set of expected names.

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaStackFrame_getHeapRoots.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaStackFrame_getHeapRoots.java?rev=890309&r1=890308&r2=890309&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaStackFrame_getHeapRoots.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/scenario142/javaruntime/TestJavaStackFrame_getHeapRoots.java
Mon Dec 14 13:29:00 2009
@@ -38,10 +38,6 @@
 public class TestJavaStackFrame_getHeapRoots extends TCKJavaRuntimeTestcase {
 	
 	
-	class HeapRootsTestParam {}
-	class HeapRootsTestLocalVariable {}
-
-	public static final String threadName = "org.apache.kato.tck.tests.javaruntime.TestJavaStackFrame_getHeapRoots#configureJavaLocalsRoots";
 	private JavaStackFrame frame = null;     
 	private Map rootsCheckList = new HashMap();
 
@@ -64,7 +60,7 @@
 				JavaThread thread = (JavaThread) next;
 				try {
 					//System.out.println("Thread: " + thread.getName());
-					if (threadName.equals( thread.getName())) {
+					if (SetupJavaStackFrame_getHeapRoots.threadName.equals( thread.getName())) {
 //						System.out.println("Thread " + thread.getName() + " found!");
 						contrivedThread = thread;
 						break;
@@ -77,7 +73,7 @@
 			}
 		}
 		if (contrivedThread == null) {
-			fail("Couldn't find thread "+threadName);
+			fail("Couldn't find thread "+SetupJavaStackFrame_getHeapRoots.threadName);
 		}
 
 		Iterator frames = contrivedThread.getStackFrames().iterator();
@@ -127,17 +123,7 @@
 	}
 
 
-	public void configureJavaLocalsRoots(ICheckpoint cp) {
-		HeapRootsTestParam param = new HeapRootsTestParam();
-		methodA(cp, param);
-	}
 	
-	private void methodA(ICheckpoint cp, HeapRootsTestParam param) {
-		HeapRootsTestLocalVariable localVariable = new HeapRootsTestLocalVariable();
-		cp.checkpoint();
-		System.out.println(param);
-		System.out.println(localVariable);
-	}
 	
 	private HeapRoot[] searchRootByClassName(Map rootCheckList, String classNameToSearch) {
 		return searchRootByClassName(rootCheckList, classNameToSearch, 0);



Mime
View raw message