AAConWS is working

[jabaws.git] / testsrc / compbio / data / sequence / SequenceUtilTester.java

diff --git a/testsrc/compbio/data/sequence/SequenceUtilTester.java b/testsrc/compbio/data/sequence/SequenceUtilTester.java
index 742fa24..f526578 100644 (file)
--- a/testsrc/compbio/data/sequence/SequenceUtilTester.java
+++ b/testsrc/compbio/data/sequence/SequenceUtilTester.java
@@ -24,6 +24,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
+import java.util.HashSet;\r
 import java.util.List;\r
 \r
 import org.testng.annotations.Test;\r
@@ -160,7 +161,6 @@ public class SequenceUtilTester {
                        assertNotNull(aseqs);\r
 \r
                        /*\r
-                        * MultiAnnotatedSequence ma = new MultiAnnotatedSequence();\r
                         * Map<Trial, List<Number>> val = ma.getInstance(Trial.class);\r
                         * List<Number> list = new ArrayList<Number>(); list.add(new\r
                         * Float(1.2)); list.add(new Double(5.662)); val.put(Trial.one,\r
@@ -181,9 +181,25 @@ public class SequenceUtilTester {
        }\r
 \r
        @Test\r
-       public void testReadResults() throws FileNotFoundException {\r
-               InputStream inStream = new FileInputStream(AllTestSuit.TEST_DATA_PATH\r
-                               + "aacon_results.txt");\r
-//             /System.out.println(SequenceUtil.readResults(inStream));\r
+       public void testReadAAConResults() {\r
+               try {\r
+                       InputStream inStream = new FileInputStream(\r
+                                       AllTestSuit.TEST_DATA_PATH + "aacon_results.txt");\r
+                       HashSet<Score> result = SequenceUtil.readAAConResults(inStream);\r
+                       inStream.close();\r
+                       assertNotNull(result);\r
+                       assertEquals(result.size(), 18);\r
+\r
+                       inStream = new FileInputStream(AllTestSuit.TEST_DATA_PATH\r
+                                       + "aacon_result_single.out");\r
+                       result = SequenceUtil.readAAConResults(inStream);\r
+                       inStream.close();\r
+                       assertNotNull(result);\r
+                       assertEquals(result.size(), 1);\r
+                       assertEquals(result.iterator().next().getScores().size(), 568);\r
+               } catch (IOException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getMessage());\r
+               }\r
        }\r
 }\r