JAL-3048 DialogRunner changes (wip)

[jalview.git] / test / jalview / util / dialogrunner / RunResponseTest.java

diff --git a/test/jalview/util/dialogrunner/RunResponseTest.java b/test/jalview/util/dialogrunner/RunResponseTest.java
index ff86675..4942b32 100644 (file)
--- a/test/jalview/util/dialogrunner/RunResponseTest.java
+++ b/test/jalview/util/dialogrunner/RunResponseTest.java
@@ -14,11 +14,11 @@ public class RunResponseTest
       @Override
       public void run()
       {
-        returned = new Response("DONE");
+        returned = "DONE";
       }
     };
-    Assert.assertEquals(rr.ourTrigger, new Response("OK"));
-    Assert.assertNotEquals(rr.ourTrigger, new Response("NOTOK"));
+    Assert.assertEquals(rr.ourTrigger, "OK");
+    Assert.assertNotEquals(rr.ourTrigger, "NOTOK");
     Assert.assertNull(rr.returned);
     Assert.assertFalse(rr.wasRun);
     // trivial ..
@@ -26,12 +26,12 @@ public class RunResponseTest
     rr.run();
     Assert.assertTrue(rr.wasRun);
 
-    Assert.assertEquals(rr.returned, new Response("DONE"));
+    Assert.assertEquals(rr.returned, "DONE");
     rr.reset();
     Assert.assertNull(rr.returned);
     Assert.assertFalse(rr.wasRun);
 
-    Assert.assertEquals(rr.toString(), "Runner for " + new Response("OK"));
+    Assert.assertEquals(rr.toString(), "Runner for " + "OK");
 
     // just test the other constructors
     RunResponse rr12 = new RunResponse(12)
@@ -39,7 +39,7 @@ public class RunResponseTest
       @Override
       public void run()
       {
-        returned = new Response("DONE");
+        returned = "DONE";
       }
     };
     RunResponse rrpi = new RunResponse(new Double(3.142))
@@ -47,11 +47,10 @@ public class RunResponseTest
       @Override
       public void run()
       {
-        returned = new Response("DONE");
+        returned = "DONE";
       }
     };
-    Assert.assertEquals(rr12.ourTrigger, new Response(12));
-    Assert.assertEquals(rrpi.ourTrigger,
-            new Response(Double.valueOf(3.142)));
+    Assert.assertEquals(rr12.ourTrigger, Integer.valueOf(12));
+    Assert.assertEquals(rrpi.ourTrigger, Double.valueOf(3.142));
 }
 }