From c4763fb6ade0d92685c6450e2c929259a64020b7 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Thu, 27 Apr 2023 19:41:21 +0100 Subject: [PATCH] JAL-629 changed args in tests --- test/jalview/bin/argparser/ArgParserTest.java | 14 +++++++------- test/jalview/bin/argparser/testfiles/dir1/argfile.txt | 2 +- test/jalview/bin/argparser/testfiles/dir2/argfile.txt | 2 +- .../bin/argparser/testfiles/dir3/subdir/subdirfile.txt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/jalview/bin/argparser/ArgParserTest.java b/test/jalview/bin/argparser/ArgParserTest.java index efd6cb8..568791d 100644 --- a/test/jalview/bin/argparser/ArgParserTest.java +++ b/test/jalview/bin/argparser/ArgParserTest.java @@ -63,7 +63,7 @@ public class ArgParserTest public void parseAutoIndexAndSubstitutionsTest(String commandLineArgs, String linkedId, Arg a, String filename) { - // { "--append=filename0 --increment --append=filename1", "JALVIEW:1", + // { "--append=filename0 --newframe --append=filename1", "JALVIEW:1", // Arg.OPEN, "filename1" }, String[] args = commandLineArgs.split("\\s+"); ArgParser argparser = new ArgParser(args); @@ -201,11 +201,11 @@ public class ArgParserTest */ { "--append=filename0 --append=filename1", "JALVIEW:0", Arg.APPEND, "filename0" }, - { "--append=filename0 --increment --append=filename1", "JALVIEW:1", + { "--append=filename0 --newframe --append=filename1", "JALVIEW:1", Arg.APPEND, "filename1" }, - { "--append=filename0 --increment --increment --append=filename2", + { "--append=filename0 --newframe --newframe --append=filename2", "JALVIEW:0", Arg.APPEND, "filename0" }, - { "--append=filename0 --increment --increment --append=filename2", + { "--append=filename0 --newframe --newframe --append=filename2", "JALVIEW:2", Arg.APPEND, "filename2" }, { "--append[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1", "linkA-0", Arg.APPEND, "filenameA0" }, @@ -225,11 +225,11 @@ public class ArgParserTest "linkH-0", Arg.IMAGE, "output-H0.txt" }, { "--open=filename0 --append=filename1", "JALVIEW:1", Arg.OPEN, "filename0" }, - { "--open=filename0 --increment --append=filename1", "JALVIEW:2", + { "--open=filename0 --newframe --append=filename1", "JALVIEW:2", Arg.APPEND, "filename1" }, - { "--open=filename0 --increment --increment --append=filename2", + { "--open=filename0 --newframe --newframe --append=filename2", "JALVIEW:1", Arg.OPEN, "filename0" }, - { "--open=filename0 --increment --increment --append=filename2", + { "--open=filename0 --newframe --newframe --append=filename2", "JALVIEW:3", Arg.APPEND, "filename2" }, { "--open[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1", "linkA-0", Arg.OPEN, "filenameA0" }, diff --git a/test/jalview/bin/argparser/testfiles/dir1/argfile.txt b/test/jalview/bin/argparser/testfiles/dir1/argfile.txt index ee9580d..16d7fad 100644 --- a/test/jalview/bin/argparser/testfiles/dir1/argfile.txt +++ b/test/jalview/bin/argparser/testfiles/dir1/argfile.txt @@ -1,5 +1,5 @@ --substitutions ---increment +--newframe --append={argfiledirname}/*.fa --colour=gecos:flower --image={argfiledirname}/{basename}.png diff --git a/test/jalview/bin/argparser/testfiles/dir2/argfile.txt b/test/jalview/bin/argparser/testfiles/dir2/argfile.txt index ee9580d..16d7fad 100644 --- a/test/jalview/bin/argparser/testfiles/dir2/argfile.txt +++ b/test/jalview/bin/argparser/testfiles/dir2/argfile.txt @@ -1,5 +1,5 @@ --substitutions ---increment +--newframe --append={argfiledirname}/*.fa --colour=gecos:flower --image={argfiledirname}/{basename}.png diff --git a/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt b/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt index ee9580d..16d7fad 100644 --- a/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt +++ b/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt @@ -1,5 +1,5 @@ --substitutions ---increment +--newframe --append={argfiledirname}/*.fa --colour=gecos:flower --image={argfiledirname}/{basename}.png -- 1.7.10.2