From c6a3237c3a86cf7324b780f8f7bea32d824bba49 Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Wed, 18 Nov 2009 11:10:18 -0800
Subject: [PATCH] 6902323: Fix testcase
 sun/tools/native2ascii/NativeErrors.java 6902325: Fix testcase
 sun/tools/jhat/HatHeapDump1Test.java Reviewed-by: tbell, dcubed

---
 test/ProblemList.txt                          |  6 ------
 test/sun/tools/jhat/HatRun.java               |  4 +++-
 test/sun/tools/native2ascii/NativeErrors.java | 20 +++++++++++++++++--
 test/sun/tools/native2ascii/test2             |  1 -
 4 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 test/sun/tools/native2ascii/test2

diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 9a366c1ba..4bced4d85 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -1117,9 +1117,6 @@ sun/jvmstat/monitor/MonitoredVm/CR6672135.java			generic-all
 # Unexpected Monitor Exception, solaris sparc -client
 sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh	generic-all
 
-# Probably should be samevm, but seem to cause errors even in othervm at times
-sun/tools/jhat/HatHeapDump1Test.java			 	generic-all
-
 # Problems on windows, jmap.exe hangs? (these run jmap)
 sun/tools/jmap/Basic.sh						windows-all
 
@@ -1129,9 +1126,6 @@ sun/tools/jstatd/jstatdDefaults.sh			 	solaris-all
 # Solaris sparcv9, jps output does not match, x64 different
 sun/tools/jstatd/jstatdExternalRegistry.sh		 	solaris-all
 
-# Probably should be samevm, but seem to cause errors even in othervm at times
-sun/tools/native2ascii/NativeErrors.java		 	generic-all
-
 # Solaris 10 sparc 32bit -client, java.lang.AssertionError: Some tests failed
 tools/jar/JarEntryTime.java					generic-all
 
diff --git a/test/sun/tools/jhat/HatRun.java b/test/sun/tools/jhat/HatRun.java
index cac66e57d..cb1e41b24 100644
--- a/test/sun/tools/jhat/HatRun.java
+++ b/test/sun/tools/jhat/HatRun.java
@@ -186,11 +186,13 @@ public class HatRun {
          */
         int nvm_options = 0;
         if ( vm_options != null ) nvm_options = vm_options.length;
-        String cmd[]     = new String[1 + (d64?1:0) + 5 + nvm_options];
+        String cmd[]     = new String[1 + (d64?1:0) + 7 + nvm_options];
         int i,j;
 
         i = 0;
         cmd[i++] = java;
+        cmd[i++] = "-cp";
+        cmd[i++] = cdir;
         cmd[i++] = "-Dtest.classes=" + cdir;
         if ( d64 ) {
             cmd[i++] = "-d64";
diff --git a/test/sun/tools/native2ascii/NativeErrors.java b/test/sun/tools/native2ascii/NativeErrors.java
index 460a9f158..c0fbad160 100644
--- a/test/sun/tools/native2ascii/NativeErrors.java
+++ b/test/sun/tools/native2ascii/NativeErrors.java
@@ -59,15 +59,28 @@ public class NativeErrors {
         in = new BufferedReader(new InputStreamReader(p.getInputStream()));
         checkResult(in, "err.bad.arg");
 
-        command = getComString("test123");
+        File f0 = new File(System.getProperty("test.src", "."), "test123");
+        String path0 = f0.getPath();
+        if ( f0.exists() ) {
+            throw new Error("Input file should not exist: " + path0);
+        }
+
+        command = getComString(path0);
         p = Runtime.getRuntime().exec(command);
         in = new BufferedReader(new InputStreamReader(p.getInputStream()));
         checkResult(in, "err.cannot.read");
 
         File f1 = new File(System.getProperty("test.src", "."), "test1");
-        File f2 = new File(System.getProperty("test.src", "."), "test2");
+        File f2 = File.createTempFile("test2", ".tmp");
         String path1 = f1.getPath();
         String path2 = f2.getPath();
+        if ( !f1.exists() ) {
+            throw new Error("Missing input file: " + path1);
+        }
+        if ( !f2.setWritable(false) ) {
+            throw new Error("Output file cannot be made read only: " + path2);
+        }
+        f2.deleteOnExit();
 
         command = getComString(path1, path2);
         p = Runtime.getRuntime().exec(command);
@@ -80,7 +93,9 @@ public class NativeErrors {
                                                            throws Exception {
         String errorReceived;
         errorReceived = in.readLine();
+        assert errorReceived != null : "First readline cannot be null";
         errorExpected = rsrc.getString(errorExpected);
+        assert errorExpected != null : "Expected message cannot be null";
         StringBuffer error = new StringBuffer(errorExpected);
         int start = errorExpected.indexOf("{0}");
         if (start >= 0) {
@@ -128,6 +143,7 @@ public class NativeErrors {
             f = new File(path);
             if (!f.exists())
                 throw new RuntimeException("Cannot find native2ascii at "+path);
+            System.out.println("Using native2ascii at "+path);
         }
         return path;
     }
diff --git a/test/sun/tools/native2ascii/test2 b/test/sun/tools/native2ascii/test2
deleted file mode 100644
index 9a669e9ce..000000000
--- a/test/sun/tools/native2ascii/test2
+++ /dev/null
@@ -1 +0,0 @@
-This file exists as a non-writable placeholder for NativeErrors.java
-- 
GitLab