Replace Map<String, HashSet<Score>> with ScoreManager and ScoreHolder classes to...

[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 a4bf4c9..682bcad 100644 (file)
--- a/testsrc/compbio/data/sequence/SequenceUtilTester.java
+++ b/testsrc/compbio/data/sequence/SequenceUtilTester.java
@@ -165,14 +165,13 @@ public class SequenceUtilTester {
                try {\r
                        fio = new FileInputStream(AllTestSuit.TEST_DATA_PATH\r
                                        + "disembl.out");\r
-                       Map<FastaSequence, HashSet<Score>> aseqs = SequenceUtil\r
-                                       .readDisembl(fio);\r
+                       Map<String, Set<Score>> aseqs = SequenceUtil.readDisembl(fio);\r
                        assertNotNull(aseqs);\r
                        assertEquals(aseqs.size(), 3);\r
                        // System.out.println(aseqs);\r
-                       for (FastaSequence fs : aseqs.keySet()) {\r
+                       for (String fs : aseqs.keySet()) {\r
                                assertTrue(" Foobar_dundeefriends Foobar dundeefriends "\r
-                                               .contains(fs.getId()));\r
+                                               .contains(fs));\r
                                Set<Score> scores = aseqs.get(fs);\r
                                assertEquals(scores.size(), 3);\r
                        }\r
@@ -218,15 +217,14 @@ public class SequenceUtilTester {
                try {\r
                        fio = new FileInputStream(AllTestSuit.TEST_DATA_PATH\r
                                        + "globplot.out");\r
-                       HashMap<FastaSequence, HashSet<Score>> aseqs = SequenceUtil\r
-                                       .readGlobPlot(fio);\r
+                       HashMap<String, Set<Score>> aseqs = SequenceUtil.readGlobPlot(fio);\r
                        assertNotNull(aseqs);\r
                        assertEquals(aseqs.size(), 3);\r
 \r
-                       FastaSequence fsdf = null;\r
+                       String fsdf = null;\r
                        Set<Score> scores = null;\r
-                       for (FastaSequence fs : aseqs.keySet()) {\r
-                               if ("Foobar_dundeefriends".contains(fs.getId())) {\r
+                       for (String fs : aseqs.keySet()) {\r
+                               if ("Foobar_dundeefriends".contains(fs)) {\r
                                        fsdf = fs;\r
                                        scores = aseqs.get(fs);\r
                                }\r