From 3f10c49d15b3f9a987cb62368ecf65b299d59ebc Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 24 Apr 2023 13:39:46 +0100 Subject: [PATCH] JAL-629 loaded props from arg in failing build server tests --- test/jalview/bin/CommandsTest2.java | 8 +++++--- .../bin/{commandsTest.jvprops => commandsTest2.jvprops} | 0 2 files changed, 5 insertions(+), 3 deletions(-) rename test/jalview/bin/{commandsTest.jvprops => commandsTest2.jvprops} (100%) diff --git a/test/jalview/bin/CommandsTest2.java b/test/jalview/bin/CommandsTest2.java index 0e1720a..f6b325e 100644 --- a/test/jalview/bin/CommandsTest2.java +++ b/test/jalview/bin/CommandsTest2.java @@ -26,7 +26,7 @@ public class CommandsTest2 @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { - Cache.loadProperties("test/jalview/bin/commandsTest.jvprops"); + Cache.loadProperties("test/jalview/bin/commandsTest2.jvprops"); Date oneHourFromNow = new Date( System.currentTimeMillis() + 3600 * 1000); Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow); @@ -181,8 +181,10 @@ public class CommandsTest2 + "--noannotations " + "--nossannotations " + "--props=test/jalview/bin/commandsTest2.jvprops1 ", 15, 0, 1 }, - { "--argfile=test/jalview/bin/commandsTest2.argfile1 ", 16, 19, 3 }, - { "--argfile=test/jalview/bin/commandsTest2.argfile2 ", 16, 0, 2 }, + { "--props=test/jalview/bin/commandsTest2.jvprops --argfile=test/jalview/bin/commandsTest2.argfile1 ", + 16, 19, 3 }, + { "--props=test/jalview/bin/commandsTest2.jvprops --argfile=test/jalview/bin/commandsTest2.argfile2 ", + 16, 0, 2 }, // }; } diff --git a/test/jalview/bin/commandsTest.jvprops b/test/jalview/bin/commandsTest2.jvprops similarity index 100% rename from test/jalview/bin/commandsTest.jvprops rename to test/jalview/bin/commandsTest2.jvprops -- 1.7.10.2