From 8337a127bde90beb39c52fb971d0facf6f5b2362 Mon Sep 17 00:00:00 2001 From: James Procter Date: Sun, 1 Oct 2023 13:24:08 +0100 Subject: [PATCH] JAL-4160 update args used in test suite for new CLI framework --- test/jalview/bin/HiDPISettingTest1.java | 4 ++-- test/jalview/ext/jmol/JmolViewerTest.java | 2 +- test/jalview/ext/rbvi/chimera/JalviewChimeraView.java | 2 +- test/jalview/gui/AlignFrameTest.java | 2 +- test/jalview/gui/AlignViewportTest.java | 2 +- test/jalview/gui/AlignmentPanelTest.java | 2 +- test/jalview/gui/DesktopTests.java | 2 +- test/jalview/gui/FeatureSettingsTest.java | 2 +- test/jalview/gui/FreeUpMemoryTest.java | 2 +- test/jalview/gui/QuitHandlerTest.java | 2 +- test/jalview/gui/ScalePanelTest.java | 2 +- test/jalview/gui/SeqPanelTest.java | 2 +- test/jalview/gui/SequenceRendererTest.java | 2 +- test/jalview/io/AnnotatedPDBFileInputTest.java | 2 +- test/jalview/io/JalviewExportPropertiesTests.java | 2 +- test/jalview/renderer/seqfeatures/FeatureRendererTest.java | 2 +- test/jalview/schemes/ColourSchemesTest.java | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/jalview/bin/HiDPISettingTest1.java b/test/jalview/bin/HiDPISettingTest1.java index 49a721f..f737c92 100644 --- a/test/jalview/bin/HiDPISettingTest1.java +++ b/test/jalview/bin/HiDPISettingTest1.java @@ -62,8 +62,8 @@ public class HiDPISettingTest1 Cache.loadProperties("test/jalview/bin/hidpiTestProps.jvprops"); Jalview.main( new String[] - { "-nosplash", "-nonews", "-noquestionnaire", - "-nowebservicediscovery" }); + { "--nosplash", "--nonews", "--noquestionnaire", + "--nowebservicediscovery" }); af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa", DataSourceType.FILE); diff --git a/test/jalview/ext/jmol/JmolViewerTest.java b/test/jalview/ext/jmol/JmolViewerTest.java index 9dec19b..a74e51d 100644 --- a/test/jalview/ext/jmol/JmolViewerTest.java +++ b/test/jalview/ext/jmol/JmolViewerTest.java @@ -65,7 +65,7 @@ public class JmolViewerTest { Jalview.main( new String[] - { "-noquestionnaire", "-nonews", "-props", + { "--noquestionnaire", "--nonews", "--props", "test/jalview/ext/rbvi/chimera/testProps.jvprops" }); } diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java index c8e30a7..e191980 100644 --- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java +++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java @@ -81,7 +81,7 @@ public class JalviewChimeraView { Jalview.main( new String[] - { "-noquestionnaire", "-nonews", "-props", + { "--noquestionnaire", "--nonews", "--props", "test/jalview/ext/rbvi/chimera/testProps.jvprops" }); Cache.setProperty(Preferences.STRUCTURE_DISPLAY, ViewerType.CHIMERA.name()); diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java index ab2a1d0..2affde0 100644 --- a/test/jalview/gui/AlignFrameTest.java +++ b/test/jalview/gui/AlignFrameTest.java @@ -69,7 +69,7 @@ public class AlignFrameTest * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); + Jalview.main(new String[] { "--nonews" }); } @AfterMethod(alwaysRun = true) diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java index 4537dcc..7399c66 100644 --- a/test/jalview/gui/AlignViewportTest.java +++ b/test/jalview/gui/AlignViewportTest.java @@ -77,7 +77,7 @@ public class AlignViewportTest { Jalview.main( new String[] - { "-nonews", "-props", "test/jalview/testProps.jvprops" }); + { "--nonews", "--props", "test/jalview/testProps.jvprops" }); /* * remove any sequence mappings left lying around by other tests diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java index c1896bc..86b22d5 100644 --- a/test/jalview/gui/AlignmentPanelTest.java +++ b/test/jalview/gui/AlignmentPanelTest.java @@ -52,7 +52,7 @@ public class AlignmentPanelTest { Jalview.main( new String[] - { "-nonews", "-props", "test/jalview/testProps.jvprops" }); + { "--nonews", "--props", "test/jalview/testProps.jvprops" }); Cache.applicationProperties.setProperty("SHOW_IDENTITY", Boolean.TRUE.toString()); diff --git a/test/jalview/gui/DesktopTests.java b/test/jalview/gui/DesktopTests.java index 897f28e..5bf3507 100644 --- a/test/jalview/gui/DesktopTests.java +++ b/test/jalview/gui/DesktopTests.java @@ -71,7 +71,7 @@ public class DesktopTests * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); + Jalview.main(new String[] { "--nonews" }); } @AfterMethod(alwaysRun = true) diff --git a/test/jalview/gui/FeatureSettingsTest.java b/test/jalview/gui/FeatureSettingsTest.java index 1b988ec..5ef693a 100644 --- a/test/jalview/gui/FeatureSettingsTest.java +++ b/test/jalview/gui/FeatureSettingsTest.java @@ -57,7 +57,7 @@ public class FeatureSettingsTest * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); + Jalview.main(new String[] { "--nonews" }); } @AfterMethod(alwaysRun = true) diff --git a/test/jalview/gui/FreeUpMemoryTest.java b/test/jalview/gui/FreeUpMemoryTest.java index a9eca49..475af2f 100644 --- a/test/jalview/gui/FreeUpMemoryTest.java +++ b/test/jalview/gui/FreeUpMemoryTest.java @@ -120,7 +120,7 @@ public class FreeUpMemoryTest { Jalview.main( new String[] - { "-nonews", "-props", "test/jalview/testProps.jvprops" }); + { "--nonews", "--props", "test/jalview/testProps.jvprops" }); String True = Boolean.TRUE.toString(); Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS", True); Cache.applicationProperties.setProperty("SHOW_QUALITY", True); diff --git a/test/jalview/gui/QuitHandlerTest.java b/test/jalview/gui/QuitHandlerTest.java index b19f160..a6a9642 100644 --- a/test/jalview/gui/QuitHandlerTest.java +++ b/test/jalview/gui/QuitHandlerTest.java @@ -55,7 +55,7 @@ public class QuitHandlerTest Jalview.main( new String[] - { "-nowebservicediscovery", "-nosplash", "-nonews" }); + { "--nowebservicediscovery", "--nosplash", "--nonews" }); } @AfterClass(alwaysRun = true) diff --git a/test/jalview/gui/ScalePanelTest.java b/test/jalview/gui/ScalePanelTest.java index 446c6ad..1523741 100644 --- a/test/jalview/gui/ScalePanelTest.java +++ b/test/jalview/gui/ScalePanelTest.java @@ -252,7 +252,7 @@ public class ScalePanelTest * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); + Jalview.main(new String[] { "--nonews" }); } } diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java index 701431b..4e8758b 100644 --- a/test/jalview/gui/SeqPanelTest.java +++ b/test/jalview/gui/SeqPanelTest.java @@ -882,7 +882,7 @@ public class SeqPanelTest * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); + Jalview.main(new String[] { "--nonews" }); } /** diff --git a/test/jalview/gui/SequenceRendererTest.java b/test/jalview/gui/SequenceRendererTest.java index 9b49232..bf78c85 100644 --- a/test/jalview/gui/SequenceRendererTest.java +++ b/test/jalview/gui/SequenceRendererTest.java @@ -51,7 +51,7 @@ public class SequenceRendererTest { Jalview.main( new String[] - { "-nonews", "-props", "test/jalview/testProps.jvprops" }); + { "--nonews", "--props", "test/jalview/testProps.jvprops" }); } @BeforeMethod(alwaysRun = true) diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index 1b62ce3..e369a02 100644 --- a/test/jalview/io/AnnotatedPDBFileInputTest.java +++ b/test/jalview/io/AnnotatedPDBFileInputTest.java @@ -199,7 +199,7 @@ public class AnnotatedPDBFileInputTest { jalview.bin.Jalview .main(new String[] - { "-props", "test/jalview/io/testProps.jvprops" }); + { "--props", "test/jalview/io/testProps.jvprops" }); } /** diff --git a/test/jalview/io/JalviewExportPropertiesTests.java b/test/jalview/io/JalviewExportPropertiesTests.java index 59c5986..29af915 100644 --- a/test/jalview/io/JalviewExportPropertiesTests.java +++ b/test/jalview/io/JalviewExportPropertiesTests.java @@ -56,7 +56,7 @@ public class JalviewExportPropertiesTests { jalview.bin.Jalview .main(new String[] - { "-props", "test/jalview/io/testProps.jvprops" }); + { "--props", "test/jalview/io/testProps.jvprops" }); } /** diff --git a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java index 944f147..53f98c3 100644 --- a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java +++ b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java @@ -625,7 +625,7 @@ public class FeatureRendererTest { Jalview.main( new String[] - { "-nonews", "-props", "test/jalview/testProps.jvprops" }); + { "--nonews", "--props", "test/jalview/testProps.jvprops" }); // codons for MCWHSE String cdsSeq = ">cds\nATGtgtTGGcacTCAgaa"; diff --git a/test/jalview/schemes/ColourSchemesTest.java b/test/jalview/schemes/ColourSchemesTest.java index 0184f12..052bb8b 100644 --- a/test/jalview/schemes/ColourSchemesTest.java +++ b/test/jalview/schemes/ColourSchemesTest.java @@ -186,7 +186,7 @@ public class ColourSchemesTest * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); + Jalview.main(new String[] { "--nonews" }); } @AfterClass(alwaysRun = true) -- 1.7.10.2