X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FFileIOTester.java;h=2404ea901aa2a1956a7a286f189e9ce696c754e1;hb=7a1a7eea9501cd9e3841e996f4926cf1686be76a;hp=7f0e72f67648d1d29f2ee8cd64046a0d61aee6d7;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git

diff --git a/test/jalview/io/FileIOTester.java b/test/jalview/io/FileIOTester.java
index 7f0e72f..2404ea9 100644
--- a/test/jalview/io/FileIOTester.java
+++ b/test/jalview/io/FileIOTester.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,14 +20,13 @@
  */
 package jalview.io;
 
-import static org.junit.Assert.*;
-
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 /**
  * @author jimp
@@ -39,7 +38,7 @@ public class FileIOTester
   /**
    * @throws java.lang.Exception
    */
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
   }
@@ -68,13 +67,13 @@ public class FileIOTester
 
   private void assertValidFormat(String fmt, String src, FileParse fp)
   {
-    assertTrue("Couldn't resolve " + src + " as a valid file", fp.isValid());
+    AssertJUnit.assertTrue("Couldn't resolve " + src + " as a valid file", fp.isValid());
     String type = new IdentifyFile().Identify(fp);
-    assertTrue("Data from '" + src + "' Expected to be '" + fmt
+    AssertJUnit.assertTrue("Data from '" + src + "' Expected to be '" + fmt
             + "' identified as '" + type + "'", type.equalsIgnoreCase(fmt));
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testStarsInFasta1() throws IOException
   {
     String uri;
@@ -83,7 +82,7 @@ public class FileIOTester
     assertValidFormat("FASTA", uri, fp);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testStarsInFasta2() throws IOException
   {
     String uri;
@@ -92,7 +91,7 @@ public class FileIOTester
     assertValidFormat("FASTA", uri, fp);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGzipIo() throws IOException
   {
     String uri;
@@ -101,7 +100,7 @@ public class FileIOTester
     assertValidFormat("FASTA", uri, fp);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGziplocalFileIO() throws IOException
   {
     String filepath;
@@ -110,7 +109,7 @@ public class FileIOTester
     assertValidFormat("FASTA", filepath, fp);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testNonGzipURLIO() throws IOException
   {
     String uri;
@@ -119,7 +118,7 @@ public class FileIOTester
     assertValidFormat("FASTA", uri, fp);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testNonGziplocalFileIO() throws IOException
   {
     String filepath;