IUPred final touches. All test cases pass

[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 7621dcc..2b2ca1a 100644 (file)
--- a/testsrc/compbio/data/sequence/SequenceUtilTester.java
+++ b/testsrc/compbio/data/sequence/SequenceUtilTester.java
@@ -291,17 +291,30 @@ public class SequenceUtilTester {
        public void testReadIUPredForShortAndLongDisorder() {\r
                try {\r
                        Map<String, Score> scores = SequenceUtil.readIUPred(new File(\r
-                                       AllTestSuit.TEST_DATA_PATH, "output.long"));\r
+                                       AllTestSuit.TEST_DATA_PATH, "out.long"));\r
                        ScoreManager man = ScoreManager.newInstanceSingleScore(scores);\r
                        // man.writeOut(new PrintWriter(System.out, true));\r
                        assertNotNull(scores);\r
-                       assertEquals(2, scores.size());\r
+                       assertEquals(3, scores.size());\r
 \r
-                       Score score = scores.get("P50_HUMAN");\r
+                       Score score = scores.get("Foobar_dundeefriends");\r
+                       assertNotNull(score);\r
+                       assertEquals(0, score.getRanges().size());\r
+                       assertEquals(568, score.getScores().size());\r
+                       assertEquals("Long", score.getMethod());\r
+                       \r
+                       score = scores.get("Foobar");\r
+                       assertNotNull(score);\r
+                       assertEquals(0, score.getRanges().size());\r
+                       assertEquals(481, score.getScores().size());\r
+                       assertEquals("Long", score.getMethod());\r
+                       \r
+                       score = scores.get("dundeefriends");\r
                        assertNotNull(score);\r
                        assertEquals(0, score.getRanges().size());\r
-                       assertEquals(393, score.getScores().size());\r
+                       assertEquals(513, score.getScores().size());\r
                        assertEquals("Long", score.getMethod());\r
+                       \r
                } catch (IOException e) {\r
                        e.printStackTrace();\r
                        fail(e.getLocalizedMessage());\r