import org.testng.Assert;
import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import jalview.bin.Cache;
+import jalview.gui.Desktop;
@Test(singleThreaded = true)
public class ArgParserTest
Cache.loadProperties("test/jalview/testProps.jvprops");
}
+ @AfterMethod(alwaysRun = true)
+ public void tearDown()
+ {
+ if (Desktop.instance != null)
+ Desktop.instance.closeAll_actionPerformed(null);
+ }
+
@Test(groups = "Functional", dataProvider = "argLines")
public void parseArgsTest(String commandLineArgs, Arg a, String other)
{
{
String[] args = commandLineArgs.split("\\s+");
ArgParser argparser = new ArgParser(args);
- ArgValuesMap avm = argparser.linkedArgs(linkedId);
+ ArgValuesMap avm = argparser.getLinkedArgs(linkedId);
ArgValue av = avm.getArgValue(a);
SubVals sv = av.getSubVals();
String testString = null;
// Arg.OPEN, "filename1" },
String[] args = commandLineArgs.split("\\s+");
ArgParser argparser = new ArgParser(args);
- ArgValuesMap avm = argparser.linkedArgs(linkedId);
+ ArgValuesMap avm = argparser.getLinkedArgs(linkedId);
ArgValue av = avm.getArgValue(a);
Assert.assertEquals(av.getValue(), filename);
}
Arg.ARGFILE, "test/jalview/bin/argfiles/testfiles/test1.fa" } };
}
- @DataProvider(name = "allLinkedIdData")
- public Object[][] allLinkedIdData()
+ @Test(groups = "Functional", dataProvider = "allLinkedIdsData")
+ public void allLinkedIdsTest(String commandLineArgs, Arg a,
+ String[] values)
+ {
+ String[] args = commandLineArgs.split("\\s+");
+ ArgParser argparser = new ArgParser(args);
+
+ int num = values.length;
+ List<String> linkedIds = argparser.getLinkedIds();
+ Assert.assertEquals(linkedIds.size(), num,
+ "Wrong number of linkedIds: " + linkedIds.toString());
+ for (int i = 0; i < num; i++)
+ {
+ String value = values[i];
+ String linkedId = linkedIds.get(i);
+ ArgValuesMap avm = argparser.getLinkedArgs(linkedId);
+ if (value == null)
+ {
+ Assert.assertTrue(avm.containsArg(a),
+ "Arg value for " + a.argString()
+ + " not applied correctly to linkedId '" + linkedId
+ + "'");
+ }
+ else
+ {
+ ArgValues avs = avm.getArgValues(a);
+ ArgValue av = avs.getArgValue();
+ String v = av.getValue();
+ value = new File(value).getAbsolutePath();
+ Assert.assertEquals(v, value, "Arg value for " + a.argString()
+ + " not applied correctly to linkedId '" + linkedId + "'");
+ }
+ }
+
+ }
+
+ @DataProvider(name = "allLinkedIdsData")
+ public Object[][] allLinkedIdsData()
{
return new Object[][] {
//
- { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --output={dirname}/{basename}.stk --close",
+ /*
+ */
+ { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --allframes --image={dirname}/{basename}.png --close",
+ Arg.CLOSE, new String[]
+ { null, null,
+ null } },
+ { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --allframes --output={dirname}/{basename}.stk --close",
Arg.OUTPUT, new String[]
- { "test/jalview/bin/argfiles/testfiles/test1.stk",
- "test/jalview/bin/argfiles/testfiles/test2.stk",
- "test/jalview/bin/argfiles/testfiles/test3.stk", } },
- { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --image={dirname}/{basename}.png --close",
+ { "test/jalview/bin/argparser/testfiles/test1.stk",
+ "test/jalview/bin/argparser/testfiles/test2.stk",
+ "test/jalview/bin/argparser/testfiles/test3.stk", } },
+ { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --allframes --image={dirname}/{basename}.png --close",
Arg.IMAGE, new String[]
- { "test/jalview/bin/argfiles/testfiles/test1.png",
- "test/jalview/bin/argfiles/testfiles/test2.png",
- "test/jalview/bin/argfiles/testfiles/test3.png", } },
- { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --image={dirname}/{basename}.png --close",
- Arg.CLOSE, null },
+ { "test/jalview/bin/argparser/testfiles/test1.png",
+ "test/jalview/bin/argparser/testfiles/test2.png",
+ "test/jalview/bin/argparser/testfiles/test3.png", } },
//
};
}