+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.bin;
+import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.HashSet;
import java.util.Set;
+import javax.imageio.ImageIO;
+import javax.swing.SwingUtilities;
+
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import jalview.gui.JvOptionPane;
import jalview.util.ArrayUtils;
-@Test(singleThreaded = true)
public class CommandsTest
{
private static final String testfiles = "test/jalview/bin/argparser/testfiles";
- private static final String png1 = testfiles + "/dir1/test2.png";
-
- private static final String png2 = testfiles + "/dir2/test2.png";
-
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
@AfterMethod(alwaysRun = true)
public void tearDown()
{
- if (Desktop.instance != null)
- Desktop.instance.closeAll_actionPerformed(null);
+ try
+ {
+ // occasionally we are blocked by Jmol redraws
+ SwingUtilities.invokeAndWait(new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ Desktop.closeDesktop();
+ }
+ });
+ } catch (Exception foo)
+ {
+ System.err.println("Failed during teardown with exception");
+ foo.printStackTrace();
+ }
+
+ }
+
+ public static void callJalviewMain(String[] args)
+ {
+ callJalviewMain(args, false);
+ }
+
+ public static void callJalviewMain(String[] args, boolean newJalview)
+ {
+ if (!newJalview || Jalview.getInstance() != null)
+ {
+ Jalview.getInstance().doMain(args);
+ }
+ else
+ {
+ Jalview.main(args);
+ }
}
- /* --setprop currently disabled
+ /* --setprops is currently disabled so this test won't work
@Test(groups = "Functional")
public void setpropsTest()
{
- String MOSTLY_HARMLESS = "MOSTLY_HARMLESS";
+ final String MOSTLY_HARMLESS = "MOSTLY_HARMLESS";
String cmdLine = "--setprop=" + MOSTLY_HARMLESS + "=Earth";
String[] args = cmdLine.split("\\s+");
Jalview.main(args);
}
*/
- @Test(groups = "Functional", dataProvider = "cmdLines")
+ @Test(
+ groups =
+ { "Functional", "testTask3" },
+ dataProvider = "cmdLines",
+ singleThreaded = true)
+
public void commandsOpenTest(String cmdLine, boolean cmdArgs,
int numFrames, String[] sequences)
{
- String[] args = cmdLine.split("\\s+");
- Jalview.main(args);
- Commands cmds = Jalview.getInstance().getCommands();
- Assert.assertNotNull(cmds);
- Assert.assertEquals(cmds.commandArgsProvided(), cmdArgs,
- "Commands were not provided in the args");
- Assert.assertEquals(cmds.argsWereParsed(), cmdArgs,
- "Overall command parse and operation is false");
+ try
+ {
+ String[] args = (cmdLine + " --gui").split("\\s+");
+ callJalviewMain(args);
+ Commands cmds = Jalview.getInstance().getCommands();
+ Assert.assertNotNull(cmds);
+ Assert.assertEquals(cmds.commandArgsProvided(), cmdArgs,
+ "Commands were not provided in the args");
+ Assert.assertEquals(cmds.argsWereParsed(), cmdArgs,
+ "Overall command parse and operation is false");
+
+ Assert.assertEquals(Desktop.getDesktopAlignFrames().length, numFrames,
+ "Wrong number of AlignFrames");
- Assert.assertEquals(Desktop.getAlignFrames().length, numFrames);
+ if (sequences != null)
+ {
+ Set<String> openedSequenceNames = new HashSet<>();
+ AlignFrame[] afs = Desktop.getDesktopAlignFrames();
+ for (AlignFrame af : afs)
+ {
+ openedSequenceNames.addAll(
+ af.getViewport().getAlignment().getSequenceNames());
+ }
+ for (String sequence : sequences)
+ {
+ Assert.assertTrue(openedSequenceNames.contains(sequence),
+ "Sequence '" + sequence
+ + "' was not found in opened alignment files: "
+ + cmdLine + ".\nOpened sequence names are:\n"
+ + String.join("\n", openedSequenceNames));
+ }
+ }
- if (sequences != null)
+ Assert.assertFalse(
+ lookForSequenceName("THIS_SEQUENCE_ID_DOESN'T_EXIST"));
+ } catch (Exception x)
{
- Set<String> openedSequenceNames = new HashSet<>();
- AlignFrame[] afs = Desktop.getAlignFrames();
- for (AlignFrame af : afs)
+ Assert.fail("Unexpected exception during commandsOpenTest", x);
+ } finally
+ {
+ tearDown();
+
+ }
+ }
+
+ @Test(
+ groups =
+ { "Functional", "testTask3" },
+ dataProvider = "structureImageOutputFiles",
+ singleThreaded = true)
+ public void structureImageOutputTest(String cmdLine, String[] filenames)
+ throws IOException
+ {
+ cleanupFiles(filenames);
+ String[] args = (cmdLine + " --gui").split("\\s+");
+ try
+ {
+ callJalviewMain(args);
+ Commands cmds = Jalview.getInstance().getCommands();
+ Assert.assertNotNull(cmds);
+ verifyIncreasingSize(cmdLine, filenames);
+ } catch (Exception x)
+ {
+ Assert.fail("Unexpected exception during structureImageOutputTest",
+ x);
+ } finally
+ {
+ cleanupFiles(filenames);
+ tearDown();
+ }
+ }
+
+ /**
+ * given two command lines, compare the output files produced - they should
+ * exist and be equal in size
+ */
+ @Test(
+ groups =
+ { "Functional", "testTask3" },
+ dataProvider = "compareHeadlessAndGUIOps",
+ singleThreaded = true)
+ public void headlessOrGuiImageOutputTest(String[] cmdLines,
+ String[] filenames) throws IOException
+ {
+ cleanupFiles(filenames);
+ try
+ {
+ for (String cmdLine : cmdLines)
{
- openedSequenceNames
- .addAll(af.getViewport().getAlignment().getSequenceNames());
+ CommandLineOperations.Worker runner = CommandLineOperations
+ .getJalviewDesktopRunner(false, cmdLine, 1000);
+ long timeOut = 10000;
+ while (runner.isAlive() && timeOut > 0)
+ {
+ Thread.sleep(25);
+ timeOut -= 25;
+ }
}
- for (String sequence : sequences)
+ verifyOrderedFileSet(cmdLines[0] + " vs " + cmdLines[1], filenames,
+ false);
+ } catch (Exception x)
+ {
+ Assert.fail("Unexpected exception during structureImageOutputTest",
+ x);
+ } finally
+ {
+ cleanupFiles(filenames);
+ tearDown();
+ }
+ }
+
+ @DataProvider(name = "compareHeadlessAndGUIOps")
+ public Object[][] compareHeadlessAndGUIOps()
+ {
+ return new Object[][] {
+ new Object[]
+ { new String[] { "--open examples/uniref50.fa "
+ + "--structure [seqid=FER1_SPIOL,tempfac=plddt,showssannotations,structureviewer=jmol]"
+ + "examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json --image="
+ + testfiles
+ + "test-al-pae-ss-gui.png --overwrite --gui --quit",
+ "--open examples/uniref50.fa "
+ + "--structure [seqid=FER1_SPIOL,tempfac=plddt,showssannotations,structureviewer=jmol]"
+ + "examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json --image="
+ + testfiles
+ + "test-al-pae-ss-nogui.png --overwrite --nogui"
+
+ }, new String[] { testfiles + "test-al-pae-ss-gui.png",
+ testfiles + "test-al-pae-ss-nogui.png", } } };
+ }
+
+ private static void verifyIncreasingSize(String cmdLine,
+ String[] filenames) throws Exception
+ {
+ verifyOrderedFileSet(cmdLine, filenames, true);
+ }
+
+ private static void verifyOrderedFileSet(String cmdLine,
+ String[] filenames, boolean increasingSize) throws Exception
+ {
+ File lastFile = null;
+ for (String filename : filenames)
+ {
+ File file = new File(filename);
+ Assert.assertTrue(file.exists(), "File '" + filename
+ + "' was not created by '" + cmdLine + "'");
+ Assert.assertTrue(file.isFile(), "File '" + filename
+ + "' is not a file from '" + cmdLine + "'");
+ Assert.assertTrue(Files.size(file.toPath()) > 0, "File '" + filename
+ + "' has no content from '" + cmdLine + "'");
+ // make sure the successive output files get bigger!
+ if (lastFile != null)
{
- Assert.assertTrue(openedSequenceNames.contains(sequence),
- "Sequence '" + sequence
- + "' was not found in opened alignment files: "
- + cmdLine + ".\nOpened sequence names are:\n"
- + String.join("\n", openedSequenceNames));
+ waitForLastWrite(file, 25);
+
+ if (increasingSize)
+ {
+ Assert.assertTrue(
+ Files.size(file.toPath()) > Files.size(lastFile.toPath()),
+ "Expected " + file.toPath() + " to be larger than "
+ + lastFile.toPath());
+ }
+ else
+ {
+ Assert.assertEquals(Files.size(file.toPath()),
+ Files.size(lastFile.toPath()),
+ "New file " + file.toPath()
+ + " (actual size) not same as last file's size "
+ + lastFile.toString());
+ }
}
+ // remember it for next file
+ lastFile = file;
}
- Assert.assertFalse(
- lookForSequenceName("THIS_SEQUENCE_ID_DOESN'T_EXIST"));
}
- @Test(groups = "Functional")
- public void argFilesGlobAndSubstitutionsTest() throws IOException
+ private static long waitForLastWrite(File file, int i) throws IOException
{
- cleanupArgfilesImages();
- String cmdLine = "--headless --argfile=" + testfiles
- + "/dir*/argfile.txt";
- String[] args = cmdLine.split("\\s+");
- Jalview.main(args);
- Commands cmds = Jalview.getInstance().getCommands();
- File file1 = new File(png1);
- File file2 = new File(png2);
- Assert.assertTrue(file1.exists(),
- "Did not make file " + png1 + " from argfile");
- Assert.assertTrue(file2.exists(),
- "Did not make file " + png2 + " from argfile");
- long size1 = Files.size(file1.toPath());
- long size2 = Files.size(file2.toPath());
- Assert.assertTrue(file1.isFile() && size1 > 0);
- Assert.assertTrue(file2.isFile() && size2 > 0);
- Assert.assertTrue(size2 > size1); // png2 has three sequences, png1 has 2
- cleanupArgfilesImages();
+ long lastSize, stableSize = Files.size(file.toPath());
+ // wait around until we are sure the file has been completely written.
+ do
+ {
+ lastSize = stableSize;
+ try
+ {
+ Thread.sleep(i);
+ } catch (Exception x)
+ {
+ }
+ stableSize = Files.size(file.toPath());
+ } while (stableSize != lastSize);
+ return stableSize;
+ }
+
+ @Test(
+ groups = "Functional",
+ dataProvider = "argfileOutputFiles",
+ singleThreaded = true)
+
+ public void argFilesGlobAndSubstitutionsTest(String cmdLine,
+ String[] filenames) throws IOException
+ {
+ cleanupFiles(filenames);
+ String[] args = (cmdLine + " --gui").split("\\s+");
+ try
+ {
+ callJalviewMain(args);
+ Commands cmds = Jalview.getInstance().getCommands();
+ Assert.assertNotNull(cmds);
+ File lastFile = null;
+ for (String filename : filenames)
+ {
+ File file = new File(filename);
+ Assert.assertTrue(file.exists(), "File '" + filename
+ + "' was not created by '" + cmdLine + "'");
+ Assert.assertTrue(file.isFile(), "File '" + filename
+ + "' is not a file from '" + cmdLine + "'");
+ Assert.assertTrue(Files.size(file.toPath()) > 0, "File '" + filename
+ + "' has no content from '" + cmdLine + "'");
+ // make sure the successive output files get bigger!
+ if (lastFile != null)
+ {
+ Assert.assertTrue(Files.size(file.toPath()) > Files
+ .size(lastFile.toPath()));
+ System.out.println("this file: " + file + " +"
+ + Files.size(file.toPath()) + " greater than "
+ + Files.size(lastFile.toPath()));
+ }
+ // remember it for next file
+ lastFile = file;
+ }
+ } catch (Exception x)
+ {
+ Assert.fail(
+ "Unexpected exception during argFilesGlobAndSubstitutions",
+ x);
+ } finally
+ {
+ cleanupFiles(filenames);
+ tearDown();
+ }
+ }
+
+ @DataProvider(name = "structureImageOutputFiles")
+ public Object[][] structureImageOutputFiles()
+ {
+ return new Object[][] {
+ //
+ { "--gui --nonews --nosplash --open=./examples/test_fab41.result/sample.a2m "
+ + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ + "--structureimage=" + testfiles + "/structureimage1.png "
+ + "--open=./examples/test_fab41.result/sample.a2m "
+ + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ + "--structureimage=" + testfiles
+ + "/structureimage2.png --scale=1.5 "
+ + "--open=./examples/test_fab41.result/sample.a2m "
+ + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ + "--structureimage=" + testfiles
+ + "/structureimage3.png --scale=2.0 ",
+ new String[]
+ { testfiles + "/structureimage1.png",
+ testfiles + "/structureimage2.png",
+ testfiles + "/structureimage3.png" } },
+ { "--headless --noquit --open=./examples/test_fab41.result/sample.a2m "
+ + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ + "--structureimage=" + testfiles + "/structureimage1.png "
+ + "--open=./examples/test_fab41.result/sample.a2m "
+ + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ + "--structureimage=" + testfiles
+ + "/structureimage2.png --scale=1.5 "
+ + "--open=./examples/test_fab41.result/sample.a2m "
+ + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ + "--structureimage=" + testfiles
+ + "/structureimage3.png --scale=2.0 ",
+ new String[]
+ { testfiles + "/structureimage1.png",
+ testfiles + "/structureimage2.png",
+ testfiles + "/structureimage3.png" } },
+ { "--gui --nonews --nosplash --open examples/1gaq.txt --append ./examples/3W5V.pdb "
+ + "--structure examples/1gaq.txt --seqid \"1GAQ|A\" "
+ + "--structureimage " + testfiles
+ + "/1gaq.png --structure examples/3W5V.pdb "
+ + "--seqid \"3W5V|A\" --structureimage " + testfiles
+ + "/3w5v.png --overwrite",
+
+ new String[]
+ { testfiles + "/1gaq.png",
+ testfiles + "/3w5v.png" } },
+ { "--headless --noquit --open ./examples/1gaq.txt --append ./examples/3W5V.pdb "
+ + "--structure examples/1gaq.txt --seqid \"1GAQ|A\" "
+ + "--structureimage " + testfiles
+ + "/1gaq.png --structure examples/3W5V.pdb "
+ + "--seqid \"3W5V|A\" --structureimage " + testfiles
+ + "/3w5v.png --overwrite",
+
+ new String[]
+ { testfiles + "/1gaq.png", testfiles + "/3w5v.png" } }
+
+ /*
+ */
+ //
+ };
+
+ }
+
+ @DataProvider(name = "argfileOutputFiles")
+ public Object[][] argfileOutputFiles()
+ {
+ return new Object[][] {
+ //
+ { "--gui --argfile=" + testfiles + "/**/*.txt", new String[]
+ { testfiles + "/dir1/test1.png", testfiles + "/dir2/test1.png",
+ testfiles + "/dir3/subdir/test0.png" } },
+ { "--gui --argfile=" + testfiles + "/**/argfile.txt", new String[]
+ { testfiles + "/dir1/test1.png", testfiles + "/dir2/test1.png" } },
+ { "--gui --argfile=" + testfiles + "/dir*/argfile.txt", new String[]
+ { testfiles + "/dir1/test1.png", testfiles + "/dir2/test1.png" } },
+ { "--gui --initsubstitutions --append examples/uniref50.fa --image "
+ + testfiles + "/{basename}.png",
+ new String[]
+ { testfiles + "/uniref50.png" } },
+ { "--gui --append examples/uniref50.fa --nosubstitutions --image "
+ + testfiles + "/{basename}.png",
+ new String[]
+ { testfiles + "/{basename}.png" } }
+ //
+ };
+
}
@DataProvider(name = "cmdLines")
String[] t2 = new String[] { "TEST2" };
String[] t3 = new String[] { "TEST3" };
return new Object[][] {
- { "--open=examples/uniref50.fa", true, 1, someUniref50Seqs },
- { "--open examples/uniref50.fa", true, 1, someUniref50Seqs },
- { "--open=examples/uniref50*.fa", true, 1, someUniref50Seqs },
+ /*
+ */
+ { "--append=examples/uniref50.fa", true, 1, someUniref50Seqs },
+ { "--append examples/uniref50.fa", true, 1, someUniref50Seqs },
+ { "--append=examples/uniref50*.fa", true, 1, someUniref50Seqs },
// NOTE we cannot use shell expansion in tests, so list all files!
- { "--open examples/uniref50.fa examples/uniref50_mz.fa", true, 1,
+ { "--append examples/uniref50.fa examples/uniref50_mz.fa", true, 1,
someUniref50Seqs },
- { "--open=[new]examples/uniref50*.fa", true, 2, someUniref50Seqs },
- { "--opennew=examples/uniref50*.fa", true, 2, someUniref50Seqs },
+ { "--append=[new]examples/uniref50*.fa", true, 2,
+ someUniref50Seqs },
+ { "--open=examples/uniref50*.fa", true, 2, someUniref50Seqs },
{ "examples/uniref50.fa", true, 1, someUniref50Seqs },
{ "examples/uniref50.fa " + testfiles + "/test1.fa", true, 2,
ArrayUtils.concatArrays(someUniref50Seqs, t1) },
{ "examples/uniref50.fa " + testfiles + "/test1.fa", true, 2, t1 },
- { "--argfile=" + testfiles + "/argfile0.txt", true, 1,
+ { "--gui --argfile=" + testfiles + "/argfile0.txt", true, 1,
ArrayUtils.concatArrays(t1, t3) },
- { "--argfile=" + testfiles + "/argfile*.txt", true, 4,
+ { "--gui --argfile=" + testfiles + "/argfile*.txt", true, 5,
ArrayUtils.concatArrays(t1, t2, t3) },
- { "--argfile=" + testfiles + "/argfile.autocounter", true, 3,
+ { "--gui --argfile=" + testfiles + "/argfile.autocounter", true, 3,
ArrayUtils.concatArrays(t1, t2) } };
+
}
public static boolean lookForSequenceName(String sequenceName)
{
- AlignFrame[] afs = Desktop.getAlignFrames();
+ AlignFrame[] afs = Desktop.getDesktopAlignFrames();
for (AlignFrame af : afs)
{
for (String name : af.getViewport().getAlignment().getSequenceNames())
return false;
}
- public static void cleanupArgfilesImages()
+ public static void cleanupFiles(String[] filenames)
{
- File png1File = new File(png1);
- File png2File = new File(png2);
- if (png1File.exists())
+ for (String filename : filenames)
{
- png1File.delete();
+ File file = new File(filename);
+ if (file.exists())
+ {
+ file.delete();
+ }
}
- if (png2File.exists())
+ }
+
+ private final String deleteDir = "test/deleteAfter";
+
+ @Test(
+ groups = "Functional",
+ dataProvider = "allLinkedIdsData",
+ singleThreaded = true)
+ public void allLinkedIdsTest(String cmdLine, String[] filenames,
+ String[] nonfilenames)
+ {
+ String[] args = (cmdLine + " --gui").split("\\s+");
+ callJalviewMain(args);
+ Commands cmds = Jalview.getInstance().getCommands();
+ Assert.assertNotNull(cmds);
+ for (String filename : filenames)
{
- png2File.delete();
+ Assert.assertTrue(new File(filename).exists(),
+ "File '" + filename + "' was not created");
+ }
+ cleanupFiles(filenames);
+ if (nonfilenames != null)
+ {
+ for (String nonfilename : nonfilenames)
+ {
+ File nonfile = new File(nonfilename);
+ Assert.assertFalse(nonfile.exists(),
+ "File " + nonfilename + " exists when it shouldn't!");
+ }
}
+
+ File deleteDirF = new File(deleteDir);
+ if (deleteDirF.exists())
+ {
+ deleteDirF.delete();
+ }
+ }
+
+ @DataProvider(name = "allLinkedIdsData")
+ public Object[][] allLinkedIdsData()
+ {
+ return new Object[][] {
+ //
+ { "--gui --open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --output={dirname}/{basename}.stk --close",
+ new String[]
+ { "test/jalview/bin/argparser/testfiles/test1.stk",
+ "test/jalview/bin/argparser/testfiles/test2.stk",
+ "test/jalview/bin/argparser/testfiles/test3.stk", },
+ null },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --image={dirname}/{basename}.png --close",
+ new String[]
+ { "test/jalview/bin/argparser/testfiles/test1.png",
+ "test/jalview/bin/argparser/testfiles/test2.png",
+ "test/jalview/bin/argparser/testfiles/test3.png", },
+ null },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/*.fa --all --output={dirname}/{basename}.stk --close",
+ new String[]
+ { "test/jalview/bin/argparser/testfiles/test1.stk",
+ "test/jalview/bin/argparser/testfiles/test2.stk",
+ "test/jalview/bin/argparser/testfiles/test3.stk", },
+ 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.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", }, },
+ { "--gui --open=test/jalview/bin/argparser/**/*.fa --all --output={dirname}/{basename}.stk --close",
+ 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/dir1/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir1/test2.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", },
+ null },
+ { "--gui --open=test/jalview/bin/argparser/**/*.fa --output=*/*.stk --close",
+ 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/dir1/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir1/test2.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", },
+ null },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/dir1/*.fa --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --all --output=*/*.stk --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.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test2.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test3.stk", },
+ 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/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", }, },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/dir1/*.fa --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --output=*/*.stk --close",
+ new String[]
+ { "test/jalview/bin/argparser/testfiles/dir2/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test2.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test3.stk", },
+ 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/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", }, },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/dir1/*.fa --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --output={dirname}/{basename}.stk --close",
+ new String[]
+ { "test/jalview/bin/argparser/testfiles/dir2/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test2.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test3.stk", },
+ 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/dir1/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir1/test2.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", }, },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/dir1/*.fa --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --output={dirname}/{basename}.stk --close",
+ new String[]
+ { "test/jalview/bin/argparser/testfiles/dir2/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test2.stk",
+ "test/jalview/bin/argparser/testfiles/dir2/test3.stk", },
+ 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/dir1/test1.stk",
+ "test/jalview/bin/argparser/testfiles/dir1/test2.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", }, },
+ { "--gui --open=test/jalview/bin/argparser/testfiles/dir1/*.fa --output {dirname}/{basename}.stk --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --output={dirname}/{basename}.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", }, },
+ // --mkdirs
+ { "--headless --open=test/jalview/bin/argparser/testfiles/dir1/*.fa --output "
+ + deleteDir
+ + "/{dirname}/{basename}.stk --open=test/jalview/bin/argparser/testfiles/dir2/*.fa --output="
+ + deleteDir
+ + "/{dirname}/{basename}.aln --close --all --mkdirs",
+ new String[]
+ { deleteDir
+ + "/test/jalview/bin/argparser/testfiles/dir1/test1.stk",
+ deleteDir
+ + "/test/jalview/bin/argparser/testfiles/dir1/test2.stk",
+ deleteDir
+ + "/test/jalview/bin/argparser/testfiles/dir2/test1.aln",
+ deleteDir
+ + "/test/jalview/bin/argparser/testfiles/dir2/test2.aln",
+ deleteDir
+ + "/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",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/test1.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/test2.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/test3.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir2/test1.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir2/test2.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir2/test3.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test0.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test1.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test2.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test3.stk",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/test1.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/test2.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/test3.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir1/test1.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir1/test2.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test0.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test1.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test2.aln",
+ deleteDir
+ + "test/jalview/bin/argparser/testfiles/dir3/subdir/test3.aln", }, },
+ //
+ };
+ }
+
+ @Test(
+ groups =
+ { "Functional", "testTask3" },
+ dataProvider = "structureImageAnnotationsOutputFiles",
+ singleThreaded = true)
+ public void structureImageAnnotationsOutputTest(String cmdLine,
+ String filename, int height) throws IOException
+ {
+ cleanupFiles(new String[] { filename });
+ String[] args = (cmdLine).split("\\s+");
+ callJalviewMain(args, true); // Create new instance of Jalview each time for
+ // linkedIds
+
+ BufferedImage img = ImageIO.read(new File(filename));
+ Assert.assertEquals(height, img.getHeight(), "Output image '" + filename
+ + "' is not in the expected height range, possibly because of the wrong number of annotations");
+
+ cleanupFiles(new String[] { filename });
+ tearDown();
+ }
+
+ @DataProvider(name = "structureImageAnnotationsOutputFiles")
+ public Object[][] structureImageAnnotationsOutputFiles()
+ {
+ String filename = "test/jalview/bin/argparser/testfiles/test_annotations.png";
+ return new Object[][] {
+ //
+ { "--headless --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--noshowssannotations " + "--noshowannotations", //
+ filename, //
+ 252 }, //
+ { "--headless --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--showssannotations " + "--noshowannotations", //
+ filename, //
+ 368 }, //
+ { "--headless --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--noshowssannotations " + "--showannotations", //
+ filename, //
+ 524 }, //
+ { "--headless --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--showssannotations " + "--showannotations", //
+ filename, //
+ 660 }, //
+ { "--gui --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--noshowssannotations " + "--noshowannotations", //
+ filename, //
+ 252 }, //
+ { "--gui --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--showssannotations " + "--noshowannotations", //
+ filename, //
+ 368 }, //
+ { "--gui --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--noshowssannotations " + "--showannotations", //
+ filename, //
+ 524 }, //
+ { "--gui --nonews --nosplash --overwrite --open=./examples/uniref50.fa "
+ + "--structure=examples/AlphaFold/AF-P00221-F1-model_v4.pdb "
+ + "--seqid=FER1_SPIOL --structureviewer=jmol "
+ + "--paematrix examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--image=" + filename + " " + "--tempfac=plddt "
+ + "--showssannotations " + "--showannotations", //
+ filename, //
+ 660 }, //
+ };
}
}
git://source.jalview.org / jalview.git / blobdiff