# HG changeset patch
# User martin
# Date 1519968215 28800
#      Thu Mar 01 21:23:35 2018 -0800
# Node ID dbbbf6d7cf6e819fd70c68f86e5025036549a5dc
# Parent  0a93645a57f149aeeba12d0892991e6c19154810
8198933: Update JDI tests to pass valid URL[]
Reviewed-by: dholmes

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -736,10 +736,6 @@
 
 com/sun/jdi/NashornPopFrameTest.java                            8187143 generic-all
 
-com/sun/jdi/EarlyReturnTest.java                                8198803 generic-all
-com/sun/jdi/EarlyReturnNegativeTest.java                        8198803 generic-all
-com/sun/jdi/MethodExitReturnValuesTest.java                     8198803 generic-all
-
 ############################################################################
 
 # jdk_time
diff --git a/test/jdk/com/sun/jdi/EarlyReturnNegativeTest.java b/test/jdk/com/sun/jdi/EarlyReturnNegativeTest.java
--- a/test/jdk/com/sun/jdi/EarlyReturnNegativeTest.java
+++ b/test/jdk/com/sun/jdi/EarlyReturnNegativeTest.java
@@ -77,8 +77,9 @@
     public static ClassLoader classLoaderValue;
     {
         try {
-            urls[0] = new URL("hi there");
-        } catch (java.net.MalformedURLException ee) {
+            urls[0] = new URL("file:/foo");
+        } catch (java.net.MalformedURLException ex) {
+            throw new AssertionError(ex);
         }
         classLoaderValue = new URLClassLoader(urls);
     }
diff --git a/test/jdk/com/sun/jdi/EarlyReturnTest.java b/test/jdk/com/sun/jdi/EarlyReturnTest.java
--- a/test/jdk/com/sun/jdi/EarlyReturnTest.java
+++ b/test/jdk/com/sun/jdi/EarlyReturnTest.java
@@ -82,8 +82,9 @@
     public static ClassLoader classLoaderValue;
     {
         try {
-            urls[0] = new URL("hi there");
-        } catch (java.net.MalformedURLException ee) {
+            urls[0] = new URL("file:/foo");
+        } catch (java.net.MalformedURLException ex) {
+            throw new AssertionError(ex);
         }
         classLoaderValue = new URLClassLoader(urls);
     }
@@ -116,8 +117,9 @@
     public static ClassLoader eclassLoaderValue;
     {
         try {
-            urls[0] = new URL("been there, done that");
-        } catch (java.net.MalformedURLException ee) {
+            urls[0] = new URL("file:/bar");
+        } catch (java.net.MalformedURLException ex) {
+            throw new AssertionError(ex);
         }
         classLoaderValue = new URLClassLoader(urls);
     }
diff --git a/test/jdk/com/sun/jdi/MethodExitReturnValuesTest.java b/test/jdk/com/sun/jdi/MethodExitReturnValuesTest.java
--- a/test/jdk/com/sun/jdi/MethodExitReturnValuesTest.java
+++ b/test/jdk/com/sun/jdi/MethodExitReturnValuesTest.java
@@ -66,8 +66,9 @@
     public static ClassLoader classLoaderValue;
     {
         try {
-            urls[0] = new URL("hi there");
-        } catch (java.net.MalformedURLException ee) {
+            urls[0] = new URL("file:/foo");
+        } catch (java.net.MalformedURLException ex) {
+            throw new AssertionError(ex);
         }
         classLoaderValue = new URLClassLoader(urls);
     }