X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FFileIOTester.java;h=48aae6ba24168d5b2d321be93950e8a7cab0e42b;hb=20d8cc2bb3e2fab2b7f637a3d523c90ceb58903d;hp=04d01b045cb4993ce8c88d7d6e04128e945ee4a4;hpb=2772202abb68d39691efc9064d927505d98f2aae;p=jalview.git

diff --git a/test/jalview/io/FileIOTester.java b/test/jalview/io/FileIOTester.java
index 04d01b0..48aae6b 100644
--- a/test/jalview/io/FileIOTester.java
+++ b/test/jalview/io/FileIOTester.java
@@ -24,17 +24,19 @@ import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringBufferInputStream;
 
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.gui.JvOptionPane;
 
 /**
@@ -57,7 +59,7 @@ public class FileIOTester
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    Cache.initLogger();
+    Console.initLogger();
   }
 
   /**
@@ -136,17 +138,23 @@ public class FileIOTester
   public void testIsGzipInputStream() throws IOException
   {
     InputStream is = new FileInputStream(ALIGN_FILE);
-    
+
     /*
      * first try fails - FileInputStream does not support mark/reset
      */
     assertFalse(FileParse.isGzipStream(is));
-    
+
     /*
      * wrap in a BufferedInputStream and try again
      */
     is = new BufferedInputStream(is, 16);
     assertTrue(FileParse.isGzipStream(is));
+
+    /*
+     * check recognition of non-gzipped input
+     */
+    assertFalse(FileParse.isGzipStream(new BufferedInputStream(
+            new ByteArrayInputStream("NOT A GZIP".getBytes()))));
   }
 
   @Test(groups = { "Functional" })