From 1a98afcef550946aec217833bb7e0cf467f00c49 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Sat, 12 Feb 2022 10:09:07 +0000 Subject: [PATCH] JAL-3949 fix testProps path and make line count more accurate --- test/jalview/bin/CommandLineOperations.java | 6 +++--- test/jalview/bin/testProps.jvprops | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index 4323699..6bf1505 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -226,7 +226,7 @@ public class CommandLineOperations public void setUpForHeadlessCommandLineInputOperations() throws IOException { - String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/io/testProps.jvprops -colour zappo " + String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/bin/testProps.jvprops -colour zappo " + "-jabaws http://www.compbio.dundee.ac.uk/jabaws -nosortbytree " + "-features examples/testdata/plantfdx.features -annotations examples/testdata/plantfdx.annotations -tree examples/testdata/uniref50_test_tree"; Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT); @@ -253,7 +253,7 @@ public class CommandLineOperations { System.out.println(ln); successfulCMDs.add(ln); - if (++count > 50) + if (++count > 30) { break; } @@ -310,7 +310,7 @@ public class CommandLineOperations // headless mode input operations { "CMD [-color zappo] executed successfully!", "Failed command : -color zappo" }, - { "CMD [-props test/jalview/io/testProps.jvprops] executed successfully!", + { "CMD [-props test/jalview/bin/testProps.jvprops] executed successfully!", "Failed command : -props File" }, { "CMD [-sortbytree] executed successfully!", "Failed command : -sortbytree" }, diff --git a/test/jalview/bin/testProps.jvprops b/test/jalview/bin/testProps.jvprops index a1ab82a..7018dc4 100644 --- a/test/jalview/bin/testProps.jvprops +++ b/test/jalview/bin/testProps.jvprops @@ -1,2 +1,3 @@ VERSION_CHECK=true LATEST_VERSION=test +logs.Jalview.level=INFO -- 1.7.10.2