X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FFileIOTester.java;h=7f0e72f67648d1d29f2ee8cd64046a0d61aee6d7;hb=4884e25f5b34c098cbfe5f207b2a3d938c9b82c4;hp=62ce9586493c85968f047f13cb472795d83259bc;hpb=48f16780e1a818055c883d259df7285a3226b073;p=jalview.git

diff --git a/test/jalview/io/FileIOTester.java b/test/jalview/io/FileIOTester.java
index 62ce958..7f0e72f 100644
--- a/test/jalview/io/FileIOTester.java
+++ b/test/jalview/io/FileIOTester.java
@@ -1,5 +1,22 @@
-/**
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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;
 
@@ -14,7 +31,7 @@ import org.junit.Test;
 
 /**
  * @author jimp
- *
+ * 
  */
 public class FileIOTester
 {
@@ -34,16 +51,80 @@ public class FileIOTester
   public static void tearDownAfterClass() throws Exception
   {
   }
-final static File ALIGN_FILE = new File("test/jalview/io/test_gz_fasta.gz");
+
+  // 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());
+    String type = new IdentifyFile().Identify(fp);
+    assertTrue("Data from '" + src + "' Expected to be '" + fmt
+            + "' identified as '" + type + "'", type.equalsIgnoreCase(fmt));
+  }
+
+  @Test
+  public void testStarsInFasta1() throws IOException
+  {
+    String uri;
+    FileParse fp = new FileParse(uri = STARS_FA_FILE1.getAbsoluteFile()
+            .toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", uri, fp);
+  }
+
+  @Test
+  public void testStarsInFasta2() throws IOException
+  {
+    String uri;
+    FileParse fp = new FileParse(uri = STARS_FA_FILE2.getAbsoluteFile()
+            .toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", uri, fp);
+  }
 
   @Test
   public void testGzipIo() throws IOException
-  {     
+  {
     String uri;
-    FileParse fp = new FileParse(uri=ALIGN_FILE.getAbsoluteFile().toURI().toString(),AppletFormatAdapter.URL);
-    assertTrue("Couldn't resolve "+uri+" as a valid file",fp.isValid());
-    String type = new IdentifyFile().Identify(fp);
-    assertTrue("Gzipped data from '"+uri+"' identified as '"+type+"'",type.equalsIgnoreCase("FASTA"));
+    FileParse fp = new FileParse(uri = ALIGN_FILE.getAbsoluteFile().toURI()
+            .toString(), AppletFormatAdapter.URL);
+    assertValidFormat("FASTA", uri, fp);
+  }
+
+  @Test
+  public void testGziplocalFileIO() throws IOException
+  {
+    String filepath;
+    FileParse fp = new FileParse(filepath = ALIGN_FILE.getAbsoluteFile()
+            .toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", filepath, fp);
   }
 
+  @Test
+  public void testNonGzipURLIO() throws IOException
+  {
+    String uri;
+    FileParse fp = new FileParse(uri = NOTGZALIGN_FILE.getAbsoluteFile()
+            .toURI().toString(), AppletFormatAdapter.URL);
+    assertValidFormat("FASTA", uri, fp);
+  }
+
+  @Test
+  public void testNonGziplocalFileIO() throws IOException
+  {
+    String filepath;
+    FileParse fp = new FileParse(filepath = NOTGZALIGN_FILE
+            .getAbsoluteFile().toString(), AppletFormatAdapter.FILE);
+    assertValidFormat("FASTA", filepath, fp);
+  }
 }