From: Ben Soares Date: Fri, 12 May 2023 14:47:29 +0000 (+0100) Subject: JAL-629 extra test for --output open*.ext when used twice for different --open's X-Git-Tag: Release_2_11_4_0~332 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fc07ec3706c45b21d90eadddd00f23d6318a7008;p=jalview.git JAL-629 extra test for --output open*.ext when used twice for different --open's --- diff --git a/.gitignore b/.gitignore index 616d27d..59c4a99 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ TESTNG /utils/install4j/jalview-installers-*.install4j /utils/install4j/jalview-install4j-conf.install4j *.swp +*.kate-swp /bin /.j2s /template.html diff --git a/test/jalview/bin/CommandsTest.java b/test/jalview/bin/CommandsTest.java index 8767098..20ccd11 100644 --- a/test/jalview/bin/CommandsTest.java +++ b/test/jalview/bin/CommandsTest.java @@ -219,7 +219,10 @@ public class CommandsTest } } - @Test(groups = "Functional", dataProvider = "allLinkedIdsData") + @Test( + groups = "Functional", + dataProvider = "allLinkedIdsData", + singleThreaded = true) public void allLinkedIdsTest(String cmdLine, String[] filenames, String[] nonfilenames) { @@ -353,6 +356,33 @@ public class CommandsTest "test/jalview/bin/argparser/testfiles/dir3/subdir/test1.stk", "test/jalview/bin/argparser/testfiles/dir3/subdir/test2.stk", "test/jalview/bin/argparser/testfiles/dir3/subdir/test3.stk", }, }, + { "--open=test/jalview/bin/argparser/testfiles/dir1/*.fa --output open*.stk --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --output=open*.aln --close", + new String[] + { "test/jalview/bin/argparser/testfiles/dir1/test1.stk", + "test/jalview/bin/argparser/testfiles/dir1/test2.stk", + "test/jalview/bin/argparser/testfiles/dir2/test1.aln", + "test/jalview/bin/argparser/testfiles/dir2/test2.aln", + "test/jalview/bin/argparser/testfiles/dir2/test3.aln", }, + new String[] + { "test/jalview/bin/argparser/testfiles/test1.stk", + "test/jalview/bin/argparser/testfiles/test2.stk", + "test/jalview/bin/argparser/testfiles/test3.stk", + "test/jalview/bin/argparser/testfiles/dir2/test1.stk", + "test/jalview/bin/argparser/testfiles/dir2/test2.stk", + "test/jalview/bin/argparser/testfiles/dir2/test3.stk", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test0.stk", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test1.stk", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test2.stk", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test3.stk", + "test/jalview/bin/argparser/testfiles/test1.aln", + "test/jalview/bin/argparser/testfiles/test2.aln", + "test/jalview/bin/argparser/testfiles/test3.aln", + "test/jalview/bin/argparser/testfiles/dir1/test1.aln", + "test/jalview/bin/argparser/testfiles/dir1/test2.aln", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test0.aln", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test1.aln", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test2.aln", + "test/jalview/bin/argparser/testfiles/dir3/subdir/test3.aln", }, }, // }; }