JAL-3048 wip externalise trigger from RunResponse

[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 4942b32..a8ae22e 100644 (file)
--- a/test/jalview/util/dialogrunner/RunResponseTest.java
+++ b/test/jalview/util/dialogrunner/RunResponseTest.java
@@ -1,6 +1,8 @@
 package jalview.util.dialogrunner;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNull;
 
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
 public class RunResponseTest
@@ -8,30 +10,23 @@ public class RunResponseTest
   @Test
   public void testRunResponse()
   {
-
     RunResponse rr = new RunResponse("OK")
     {
       @Override
       public void run()
       {
-        returned = "DONE";
+        returnValue = "DONE";
       }
     };
-    Assert.assertEquals(rr.ourTrigger, "OK");
-    Assert.assertNotEquals(rr.ourTrigger, "NOTOK");
-    Assert.assertNull(rr.returned);
-    Assert.assertFalse(rr.wasRun);
-    // trivial ..
-    rr.wasRun = true;
-    rr.run();
-    Assert.assertTrue(rr.wasRun);
+    assertEquals(rr.trigger, "OK");
+    assertNotEquals(rr.trigger, "NOTOK");
+    assertNull(rr.returnValue);
 
-    Assert.assertEquals(rr.returned, "DONE");
+    assertEquals(rr.returnValue, "DONE");
     rr.reset();
-    Assert.assertNull(rr.returned);
-    Assert.assertFalse(rr.wasRun);
+    assertNull(rr.returnValue);
 
-    Assert.assertEquals(rr.toString(), "Runner for " + "OK");
+    assertEquals(rr.toString(), "Runner for " + "OK");
 
     // just test the other constructors
     RunResponse rr12 = new RunResponse(12)
@@ -39,7 +34,7 @@ public class RunResponseTest
       @Override
       public void run()
       {
-        returned = "DONE";
+        returnValue = "DONE";
       }
     };
     RunResponse rrpi = new RunResponse(new Double(3.142))
@@ -47,10 +42,10 @@ public class RunResponseTest
       @Override
       public void run()
       {
-        returned = "DONE";
+        returnValue = "DONE";
       }
     };
-    Assert.assertEquals(rr12.ourTrigger, Integer.valueOf(12));
-    Assert.assertEquals(rrpi.ourTrigger, Double.valueOf(3.142));
+    assertEquals(rr12.trigger, Integer.valueOf(12));
+    assertEquals(rrpi.trigger, Double.valueOf(3.142));
 }
 }