X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FTCoffeeScoreFileTest.java;h=6d11ebed96e5bb5db5605a29337769e3ad616b01;hb=ab271f65ad7519b988efbfa04e32a0199d9bd8d4;hp=493e9cd96166bfb67eafe19b0210cdfa494e6574;hpb=a7f8fa9c06d82efbbdbc6a0bf1054bb21610b353;p=jalview.git

diff --git a/test/jalview/io/TCoffeeScoreFileTest.java b/test/jalview/io/TCoffeeScoreFileTest.java
index 493e9cd..6d11ebe 100644
--- a/test/jalview/io/TCoffeeScoreFileTest.java
+++ b/test/jalview/io/TCoffeeScoreFileTest.java
@@ -1,15 +1,29 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * 
+ * 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/>.
+ */
 package jalview.io;
 
 import static org.junit.Assert.*;
 import jalview.io.TCoffeeScoreFile.Block;
 import jalview.io.TCoffeeScoreFile.Header;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -20,18 +34,20 @@ import org.xml.sax.SAXException;
 import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax;
 import fr.orsay.lri.varna.exceptions.ExceptionLoadingFailed;
 import fr.orsay.lri.varna.exceptions.ExceptionPermissionDenied;
+import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;
 
 public class TCoffeeScoreFileTest {
 
 	final static File SCORE_FILE = new File("test/jalview/io/tcoffee.score_ascii");
-        final static File ALIGN_FILE = new File("test/jalview/io/tcoffee.fasta_aln");
+    final static File ALIGN_FILE = new File("test/jalview/io/tcoffee.fasta_aln");
 	
 	@Test
-	public void testReadHeader() throws IOException, FileNotFoundException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {
+	public void testReadHeader() throws IOException {
 
-	        TCoffeeScoreFile scoreFile = new TCoffeeScoreFile(SCORE_FILE.getPath(),AppletFormatAdapter.FILE);
-	        assertTrue(scoreFile.getWarningMessage(),scoreFile.isValid());
-		Header header = scoreFile.header;
+	    TCoffeeScoreFile scoreFile = new TCoffeeScoreFile(SCORE_FILE.getPath(),AppletFormatAdapter.FILE);
+	    assertTrue(scoreFile.getWarningMessage(),scoreFile.isValid());
+		
+	    Header header = scoreFile.header;
 		assertNotNull(header);
 		assertEquals( "T-COFFEE, Version_9.02.r1228 (2012-02-16 18:15:12 - Revision 1228 - Build 336)", header.head );
 		assertEquals( 90, header.score );
@@ -48,18 +64,19 @@ public class TCoffeeScoreFileTest {
 	
 	
 	@Test
-	public void testWrongFile() throws ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {
+	public void testWrongFile()  {
 	    try {
-		TCoffeeScoreFile result = new TCoffeeScoreFile(ALIGN_FILE.getPath(), FormatAdapter.FILE);
-		assertFalse(result.isValid());
-	    } catch (IOException x)
+			TCoffeeScoreFile result = new TCoffeeScoreFile(ALIGN_FILE.getPath(), FormatAdapter.FILE);
+			assertFalse(result.isValid());
+	    } 
+	    catch (IOException x)
 	    {
 	      assertTrue("File not found exception thrown",x instanceof FileNotFoundException);
 	    }
 	} 
 
 	@Test
-	public void testHeightAndWidth() throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {
+	public void testHeightAndWidth() throws IOException {
 		TCoffeeScoreFile result = new TCoffeeScoreFile(SCORE_FILE.getPath(), FormatAdapter.FILE);
 		assertTrue(result.isValid());
 		assertEquals( 8, result.getHeight() );
@@ -99,7 +116,7 @@ public class TCoffeeScoreFileTest {
 	}
 
 	@Test
-	public void testParse() throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {
+	public void testParse() throws IOException {
 
 		TCoffeeScoreFile parser = new TCoffeeScoreFile(SCORE_FILE.getPath(), FormatAdapter.FILE);
 
@@ -116,7 +133,7 @@ public class TCoffeeScoreFileTest {
 
 	
 	@Test
-	public void testGetAsList() throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {
+	public void testGetAsList() throws IOException {
 		
           TCoffeeScoreFile parser = new TCoffeeScoreFile(SCORE_FILE.getPath(),FormatAdapter.FILE);
           assertTrue(parser.getWarningMessage(),parser.isValid());
@@ -135,7 +152,7 @@ public class TCoffeeScoreFileTest {
 	
 	
 	@Test
-	public void testGetAsArray() throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {
+	public void testGetAsArray() throws IOException {
 		
           TCoffeeScoreFile parser = new TCoffeeScoreFile(SCORE_FILE.getPath(),FormatAdapter.FILE);
           assertTrue(parser.getWarningMessage(),parser.isValid());
@@ -163,6 +180,15 @@ public class TCoffeeScoreFileTest {
 		
 	} 
 	
+	@Test
+	public void testHeightAndWidthWithResidueNumbers() throws Exception {
+		String file = "test/jalview/io/tcoffee.score_ascii_with_residue_numbers";
+		TCoffeeScoreFile result = new TCoffeeScoreFile(file, FormatAdapter.FILE);
+		assertTrue(result.isValid());
+		assertEquals( 5, result.getHeight() );
+		assertEquals( 84, result.getWidth() );
+	} 	
+	
 	
 	
 }