*/
package jalview.bin;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import jalview.gui.JvOptionPane;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import org.testng.Assert;
private static String modules = null;
+ private static String java_exe = null;
+
public synchronized static String getClassPath()
{
if (scanner == null)
{
modules.concat(mr.getName());
}
+ java_exe = System.getProperty("java.home") + File.separator + "bin"
+ + File.separator + "java";
+
}
while (classpath == null)
{
// Note: JAL-3065 - don't include quotes for lib/* because the arguments are
// not expanded by the shell
String classpath = getClassPath();
- String _cmd = "java " + (withAwt ? "-Djava.awt.headless=true" : "")
+ String _cmd = java_exe + " "
+ + (withAwt ? "-Djava.awt.headless=true" : "")
+ " -classpath " + classpath
+ (modules.length() > 2 ? "--add-modules=\"" + modules + "\""
: "")
return worker;
}
+ @Test(groups = { "Functional" })
+ public void reportCurrentWorkingDirectory()
+ {
+ try
+ {
+ Path currentRelativePath = Paths.get("");
+ String s = currentRelativePath.toAbsolutePath().toString();
+ System.out.println("Test CWD is " + s);
+ } catch (Exception q)
+ {
+ q.printStackTrace();
+ }
+ }
+
@BeforeTest(alwaysRun = true)
public void initialize()
{
{
System.out.println(ln);
successfulCMDs.add(ln);
- if (++count > 5)
+ if (++count > 25)
{
break;
}
file.deleteOnExit();
Worker worker = getJalviewDesktopRunner(withAWT, cmd, timeout);
assertNotNull(worker, "worker is null");
- String msg = "Didn't create an output" + type + " file at '"
- + file.getAbsolutePath() + "'.[" + harg + "]";
+ String msg = "Didn't create an output" + type + " file.[" + harg + "]";
assertTrue(file.exists(), msg);
FileAssert.assertFile(file, msg);
FileAssert.assertMinLength(file, expectedMinFileSize);