X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;fp=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=d9d3bb3c78639cdf2a04c8e32576eb3f1a6fb802;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hp=ec0b160094cdc65a0c35d1bdfa9791245fa87d25;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index ec0b160..d9d3bb3 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -20,16 +20,16 @@ */ package jalview.bin; -import static org.junit.Assert.*; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.testng.Assert; +import org.testng.AssertJUnit; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; public class CommandLineOperations { @@ -131,16 +131,17 @@ public class CommandLineOperations System.out.println("Testing with Headless argument: '" + harg + "'\n"); Worker worker = jalviewDesktopRunner(withAwt, cmd, 9000); - assertTrue("Didn't create an output EPS file.[" + harg + "]", - new File("test_uniref50_out.eps").exists()); - assertTrue("Didn't create an EPS file with any content[" + harg - + "]", new File("test_uniref50_out.eps").length() > 4096); + AssertJUnit.assertTrue("Didn't create an output EPS file.[" + harg + + "]", new File("test_uniref50_out.eps").exists()); + AssertJUnit.assertTrue( + "Didn't create an EPS file with any content[" + harg + "]", + new File("test_uniref50_out.eps").length() > 4096); if (worker.exit == null) { worker.interrupt(); Thread.currentThread().interrupt(); worker.process.destroy(); - fail("Jalview did not exit after EPS generation (try running test again to verify - timeout at 9000ms). [" + Assert.fail("Jalview did not exit after EPS generation (try running test again to verify - timeout at 9000ms). [" + harg + "]"); } } while (!withAwt);