From 00a58e3e49a1f758969fcbd6c537033744c6126d Mon Sep 17 00:00:00 2001 From: "Daniel Cunha (soro)" Date: Mon, 17 Dec 2018 14:19:49 -0300 Subject: [PATCH] Fix test for TomEECliIT --- .../java/org/apache/tomee/TomEECliIT.java | 57 +++++++++++++++++-- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java b/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java index bff58c49953..453e21aa2b8 100644 --- a/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java +++ b/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java @@ -26,6 +26,7 @@ import java.io.File; import java.io.FileFilter; +import java.io.FilenameFilter; import java.io.IOException; import java.nio.file.Files; @@ -65,11 +66,33 @@ public boolean accept(final File pathname) { fail("Failed to find Tomcat directory required for this test - Ensure you have run at least the maven phase: mvn process-resources"); } + final File libDir = new File(tomee.getAbsolutePath() + File.separator + "lib"); + final String[] openejbCore = libDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("openejb-core"); + } + }); + + final String[] commonsCli = libDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("commons-cli"); + } + }); + + final String[] commonsLang = libDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("commons-lang"); + } + }); + final ProcessBuilder builder = new ProcessBuilder() .command("java", "-cp", jar.getAbsolutePath() + File.pathSeparator + - tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "openejb-core-8.0.0-SNAPSHOT.jar" + File.pathSeparator + - tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-cli-1.2.jar" + File.pathSeparator + - tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-lang3-3.8.1.jar", + tomee.getAbsolutePath() + File.separator + "lib" + File.separator + openejbCore[0] + File.pathSeparator + + tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsCli[0] + File.pathSeparator + + tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsLang[0], "org.apache.openejb.cli.Bootstrap", "classloadertest"); final Process start = builder.start(); @@ -159,12 +182,34 @@ public boolean accept(final File pathname) { fail("Failed to find Tomcat directory required for this test - Ensure you have run at least the maven phase: mvn process-resources"); } + final File libDir = new File(tomee.getAbsolutePath() + File.separator + "lib"); + final String[] openejbCore = libDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("openejb-core"); + } + }); + + final String[] commonsCli = libDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("commons-cli"); + } + }); + + final String[] commonsLang = libDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("commons-lang"); + } + }); + final ProcessBuilder builder = new ProcessBuilder() .command("java", "-cp", jar.getAbsolutePath() + File.pathSeparator + jar2.getAbsolutePath() + File.pathSeparator + - tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "openejb-core-8.0.0-SNAPSHOT.jar" + File.pathSeparator + - tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-cli-1.2.jar" + File.pathSeparator + - tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-lang3-3.8.1.jar", + tomee.getAbsolutePath() + File.separator + "lib" + File.separator + openejbCore[0] + File.pathSeparator + + tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsCli[0] + File.pathSeparator + + tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsLang[0], "org.apache.openejb.cli.Bootstrap", "classloadertest2"); final Process start = builder.start();