Fix bug in category class and use Jim's test as a test case

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

diff --git a/testsrc/compbio/runner/disorder/GlobPlotTester.java b/testsrc/compbio/runner/disorder/GlobPlotTester.java
index ffafe26..b32e8d4 100644 (file)
--- a/testsrc/compbio/runner/disorder/GlobPlotTester.java
+++ b/testsrc/compbio/runner/disorder/GlobPlotTester.java
@@ -41,6 +41,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.SyncExecutor;\r
@@ -187,9 +188,9 @@ public class GlobPlotTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       Map<String, Set<Score>> al2 = confGlobPlot.getResults();\r
+                       ScoreManager al2 = confGlobPlot.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
@@ -281,12 +282,11 @@ public class GlobPlotTester {
        @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testConfigurationLoading() {\r
                try {\r
-                       RunnerConfig<GlobPlot> disemblConfig = ConfExecutable\r
+                       RunnerConfig<GlobPlot> globplotConfig = ConfExecutable\r
                                        .getRunnerOptions(GlobPlot.class);\r
-                       assertNotNull(disemblConfig);\r
-                       // There is no disembl parameters\r
-                       assertTrue(disemblConfig.getArguments().size() == 0);\r
-\r
+                       // There is no GlobPlot parameters \r
+                       assertNull(globplotConfig);\r
+                       \r
                        PresetManager<GlobPlot> disemblPresets = ConfExecutable\r
                                        .getRunnerPresets(GlobPlot.class);\r
                        assertNull(disemblPresets); // there is no presets\r