A wee improvement

[jabaws.git] / testsrc / compbio / runner / disorder / DisemblTester.java

diff --git a/testsrc/compbio/runner/disorder/DisemblTester.java b/testsrc/compbio/runner/disorder/DisemblTester.java
index 133168e..6ea203c 100644 (file)
--- a/testsrc/compbio/runner/disorder/DisemblTester.java
+++ b/testsrc/compbio/runner/disorder/DisemblTester.java
@@ -42,6 +42,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;\r
 \r
 import compbio.data.sequence.Score;\r
+import compbio.data.sequence.ScoreManager;\r
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
 import compbio.engine.FilePuller;\r
@@ -190,9 +191,9 @@ public class DisemblTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       Map<String,Set<Score>> al2 = confDisembl.getResults();\r
+                       ScoreManager al2 = confDisembl.getResults();\r
                        assertNotNull(al2);\r
-                       assertEquals(al2.size(), 3);\r
+                       assertEquals(al2.asMap().size(), 3);\r
                        assertEquals(al1.getResults(), al2);\r
                } catch (JobSubmissionException e) {\r
                        e.printStackTrace();\r
@@ -284,9 +285,12 @@ public class DisemblTester {
                try {\r
                        RunnerConfig<Disembl> disemblConfig = ConfExecutable\r
                                        .getRunnerOptions(Disembl.class);\r
-                       assertNotNull(disemblConfig);\r
                        // There is no disembl parameters\r
-                       assertTrue(disemblConfig.getArguments().size() == 0);\r
+                       assertNull(disemblConfig);\r
+\r
+                       //If there were a DisemblParameter.xml file and reference to it, \r
+                       // it would be like that \r
+                       // assertTrue(disemblConfig.getArguments().size() == 0);\r
 \r
                        PresetManager<Disembl> disemblPresets = ConfExecutable\r
                                        .getRunnerPresets(Disembl.class);\r