X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FFileIOTester.java;h=fef717399c101494079d7758b595aa24ae784000;hb=63bb86fb2312c426063e8cd79de4685c05c4bc35;hp=a2aa5dafa5e53b8c824e5bbcdec84bf47c669b8b;hpb=9809e9cda7fea9968e6e50696b215a591f6172d3;p=jalview.git

diff --git a/test/jalview/io/FileIOTester.java b/test/jalview/io/FileIOTester.java
index a2aa5da..fef7173 100644
--- a/test/jalview/io/FileIOTester.java
+++ b/test/jalview/io/FileIOTester.java
@@ -1,20 +1,36 @@
-/**
+/*
+ * 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.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
- *
+ * 
  */
 public class FileIOTester
 {
@@ -22,7 +38,7 @@ public class FileIOTester
   /**
    * @throws java.lang.Exception
    */
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
   }
@@ -34,42 +50,81 @@ public class FileIOTester
   public static void tearDownAfterClass() throws Exception
   {
   }
-  final static File ALIGN_FILE = new File("test/jalview/io/test_gz_fasta.gz");
-  final static File NOTGZALIGN_FILE = new File("test/jalview/io/test_gz_fasta_notgz.gz");
 
-  private void assertValidFasta(String src, FileParse fp)
+  // TODO: make a better/more comprehensive test harness for identify/io
+
+  final static File ALIGN_FILE = new File(
+          "test/jalview/io/test_gz_fasta.gz");
+
+  final static File NOTGZALIGN_FILE = new File(
+          "test/jalview/io/test_gz_fasta_notgz.gz");
+
+  final static File STARS_FA_FILE1 = new File(
+          "test/jalview/io/test_fasta_stars.fa");
+
+  final static File STARS_FA_FILE2 = new File(
+          "test/jalview/io/test_fasta_stars2.fa");
+
+  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("Gzipped data from '"+src+"' identified as '"+type+"'",type.equalsIgnoreCase("FASTA"));
+    AssertJUnit.assertTrue("Data from '" + src + "' Expected to be '" + fmt
+            + "' identified as '" + type + "'", type.equalsIgnoreCase(fmt));
+  }
+
+  @Test(groups = { "Functional" })
+  public void testStarsInFasta1() throws IOException
+  {
+    String uri;
+    FileParse fp = new FileParse(uri = STARS_FA_FILE1.getAbsoluteFile()
+            .toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", uri, fp);
   }
-  @Test
+
+  @Test(groups = { "Functional" })
+  public void testStarsInFasta2() throws IOException
+  {
+    String uri;
+    FileParse fp = new FileParse(uri = STARS_FA_FILE2.getAbsoluteFile()
+            .toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", uri, fp);
+  }
+
+  @Test(groups = { "Functional" })
   public void testGzipIo() throws IOException
-  {     
+  {
     String uri;
-    FileParse fp = new FileParse(uri=ALIGN_FILE.getAbsoluteFile().toURI().toString(),AppletFormatAdapter.URL);
-    assertValidFasta(uri, fp);
+    FileParse fp = new FileParse(uri = ALIGN_FILE.getAbsoluteFile().toURI()
+            .toString(), AppletFormatAdapter.URL);
+    assertValidFormat("FASTA", uri, fp);
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testGziplocalFileIO() throws IOException
   {
     String filepath;
-    FileParse fp = new FileParse(filepath=ALIGN_FILE.getAbsoluteFile().toString(), AppletFormatAdapter.FILE);
-    assertValidFasta(filepath, fp);
+    FileParse fp = new FileParse(filepath = ALIGN_FILE.getAbsoluteFile()
+            .toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", filepath, fp);
   }
-  @Test
+
+  @Test(groups = { "Functional" })
   public void testNonGzipURLIO() throws IOException
   {
     String uri;
-    FileParse fp = new FileParse(uri=NOTGZALIGN_FILE.getAbsoluteFile().toURI().toString(),AppletFormatAdapter.URL);
-    assertValidFasta(uri, fp);
+    FileParse fp = new FileParse(uri = NOTGZALIGN_FILE.getAbsoluteFile()
+            .toURI().toString(), AppletFormatAdapter.URL);
+    assertValidFormat("FASTA", uri, fp);
   }
-  @Test
+
+  @Test(groups = { "Functional" })
   public void testNonGziplocalFileIO() throws IOException
   {
     String filepath;
-    FileParse fp = new FileParse(filepath=NOTGZALIGN_FILE.getAbsoluteFile().toString(), AppletFormatAdapter.FILE);
-    assertValidFasta(filepath, fp);
+    FileParse fp = new FileParse(filepath = NOTGZALIGN_FILE
+            .getAbsoluteFile().toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", filepath, fp);
   }
 }