DisEMBL and GlobProt web services further work

[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 7f45855..a4bf4c9 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.HashMap;\r
 import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Map;\r
@@ -164,11 +165,11 @@ public class SequenceUtilTester {
                try {\r
                        fio = new FileInputStream(AllTestSuit.TEST_DATA_PATH\r
                                        + "disembl.out");\r
-                       Map<FastaSequence, Set<Score>> aseqs = SequenceUtil\r
+                       Map<FastaSequence, HashSet<Score>> aseqs = SequenceUtil\r
                                        .readDisembl(fio);\r
                        assertNotNull(aseqs);\r
                        assertEquals(aseqs.size(), 3);\r
-                       System.out.println(aseqs);\r
+                       // System.out.println(aseqs);\r
                        for (FastaSequence fs : aseqs.keySet()) {\r
                                assertTrue(" Foobar_dundeefriends Foobar dundeefriends "\r
                                                .contains(fs.getId()));\r
@@ -217,7 +218,7 @@ public class SequenceUtilTester {
                try {\r
                        fio = new FileInputStream(AllTestSuit.TEST_DATA_PATH\r
                                        + "globplot.out");\r
-                       Map<FastaSequence, Set<Score>> aseqs = SequenceUtil\r
+                       HashMap<FastaSequence, HashSet<Score>> aseqs = SequenceUtil\r
                                        .readGlobPlot(fio);\r
                        assertNotNull(aseqs);\r
                        assertEquals(aseqs.size(), 3);\r
@@ -232,12 +233,12 @@ public class SequenceUtilTester {
                                assertEquals(scores.size(), 5);\r
                        }\r
                        for (Score score : scores) {\r
-                               \r
+\r
                                if (score.getMethod() == (Enum<?>) GlobProtResult.Disorder) {\r
                                        assertEquals(score.getRanges().size(), 7);\r
                                        assertTrue(score.getScores().isEmpty());\r
                                }\r
-                               if (score.getMethod() == (Enum<?>)GlobProtResult.Dydx) {\r
+                               if (score.getMethod() == (Enum<?>) GlobProtResult.Dydx) {\r
                                        assertFalse(score.getScores().isEmpty());\r
                                        assertTrue(score.getRanges().isEmpty());\r
                                }\r