JAL-1067 - T-Coffee score file reader

[jalview.git] / test / jalview / io / TCoffeeScoreFileTest.java

diff --git a/test/jalview/io/TCoffeeScoreFileTest.java b/test/jalview/io/TCoffeeScoreFileTest.java
index f654ba1..27df5e0 100644 (file)
--- a/test/jalview/io/TCoffeeScoreFileTest.java
+++ b/test/jalview/io/TCoffeeScoreFileTest.java
@@ -36,6 +36,13 @@ public class TCoffeeScoreFileTest {
                assertEquals( 90, header.getScoreFor("cons") );
        }
        
+       
+       @Test
+       public void testWrongFile() {
+               TCoffeeScoreFile result = TCoffeeScoreFile.load(new File("./test/jalview/io/tcoffee.fasta_aln"));
+               assertNull(result);
+       } 
+       
        @Test
        public void testReadBlock( ) throws IOException {
                
@@ -70,8 +77,7 @@ public class TCoffeeScoreFileTest {
        @Test
        public void testParse() throws FileNotFoundException {
 
-               TCoffeeScoreFile parser = new TCoffeeScoreFile();
-               parser.parse(new BufferedReader(new FileReader(SCORE_FILE)) );
+               TCoffeeScoreFile parser = TCoffeeScoreFile.load(new BufferedReader(new FileReader(SCORE_FILE)) );
 
                assertEquals( "999999999999999999999999998762112222543211112134----------5666642367889999999999889", parser.getScoresFor("1PHT") );
                assertEquals( "99999999999999999999999999987-------4322----22341111111111676653-355679999999999889", parser.getScoresFor("1BB9") );
@@ -88,8 +94,7 @@ public class TCoffeeScoreFileTest {
        @Test
        public void testGetAsList() throws FileNotFoundException {
                
-               TCoffeeScoreFile parser = new TCoffeeScoreFile();
-               parser.parse(new BufferedReader(new FileReader(SCORE_FILE)) );
+               TCoffeeScoreFile parser = TCoffeeScoreFile.load(new BufferedReader(new FileReader(SCORE_FILE)) );
 
                List<String> scores = parser.getScoresList();
                assertEquals( "999999999999999999999999998762112222543211112134----------5666642367889999999999889", scores.get(0) );
@@ -108,8 +113,7 @@ public class TCoffeeScoreFileTest {
        @Test
        public void testGetAsArray() throws FileNotFoundException {
                
-               TCoffeeScoreFile parser = new TCoffeeScoreFile();
-               parser.parse(new BufferedReader(new FileReader(SCORE_FILE)) );
+               TCoffeeScoreFile parser = TCoffeeScoreFile.load(new BufferedReader(new FileReader(SCORE_FILE)) );
 
                byte[][] scores = parser.getScoresArray();