From 85ea78c1918b0edf36ceb1f323923e2987402745 Mon Sep 17 00:00:00 2001 From: Pavel Rappo Date: Wed, 5 Nov 2014 11:11:27 +0000 Subject: [PATCH] 8062759: Update test/javax/naming/spi/providers/InitialContextTest.java to use classpath Reviewed-by: mchung --- .../spi/providers/InitialContextTest.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/jdk/test/javax/naming/spi/providers/InitialContextTest.java b/jdk/test/javax/naming/spi/providers/InitialContextTest.java index 079f636331e..054365878a1 100644 --- a/jdk/test/javax/naming/spi/providers/InitialContextTest.java +++ b/jdk/test/javax/naming/spi/providers/InitialContextTest.java @@ -68,10 +68,9 @@ public class InitialContextTest { Path dst = tmp.resolve("Test.java"); Files.copy(src, dst); - javac(tmp, dst); - Path build = Files.createDirectory(tmp.resolve("build")); - Files.copy(tmp.resolve("Test.class"), build.resolve("Test.class")); + + javac(build, dst); Map props = singletonMap(Context.INITIAL_CONTEXT_FACTORY, factoryClassFqn); @@ -107,13 +106,13 @@ public class InitialContextTest { Path dst1 = createFactoryFrom(templatesHome().resolve("factory.template"), factoryClassFqn, tmp); - javac(tmp, dst); + Path build = Files.createDirectory(tmp.resolve("build")); + + javac(build, dst); Path explodedJar = Files.createDirectory(tmp.resolve("exploded-jar")); javac(explodedJar, dst1); jar(tmp.resolve("test.jar"), explodedJar); - Path build = Files.createDirectory(tmp.resolve("build")); - Files.copy(tmp.resolve("Test.class"), build.resolve("Test.class")); Files.copy(tmp.resolve("test.jar"), build.resolve("test.jar")); Map props @@ -191,7 +190,9 @@ public class InitialContextTest { Path dst1 = createFactoryFrom(templatesHome().resolve("broken_factory.template"), factoryClassFqn, tmp); - javac(tmp, dst); + Path build = Files.createDirectory(tmp.resolve("build")); + + javac(build, dst); Path explodedJar = Files.createDirectory(tmp.resolve("exploded-jar")); Path services = Files.createDirectories(explodedJar.resolve("META-INF") @@ -208,15 +209,12 @@ public class InitialContextTest { javac(explodedJar, dst1); jar(tmp.resolve("test.jar"), explodedJar); - Path build = Files.createDirectory(tmp.resolve("build")); - Files.copy(tmp.resolve("Test.class"), build.resolve("Test.class")); Files.copy(tmp.resolve("test.jar"), build.resolve("test.jar")); - Map props = new HashMap<>(); - props.put("java.ext.dirs", build.toString()); - props.put(Context.INITIAL_CONTEXT_FACTORY, factoryClassFqn); + Map props + = singletonMap(Context.INITIAL_CONTEXT_FACTORY, factoryClassFqn); - Result r = java(props, singleton(build), "Test"); + Result r = java(props, asList(build.resolve("test.jar"), build), "Test"); if (r.exitValue == 0 || !verifyOutput(r.output, factoryClassFqn)) throw new RuntimeException(r.output);