commit 264380c0fd6d404d51b72d7d64fb25cef702bad6
author Henri Biestro <henrib@apache.org> Thu Jul 14 07:31:10 2016 +0000
committer Henri Biestro <henrib@apache.org> Thu Jul 14 07:31:10 2016 +0000
tree fb35f7b8c94ac51452c9d4b6c1a6ad81f33d3c31
parent 23de42068782fb40a2116c87a2dc46d4e87abf3c

JEXL: 
JEXL-205 / JEXL-206 - clean up tests

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jexl/trunk@1752595 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java

diff --git a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
index 6d63867..661c0c1 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
@@ -68,13 +68,13 @@
         JexlContext ctxt = new MapContext();
         ctxt.set("latch", latch);
 
-        JexlScript e = JEXL.createScript("latch.acquire(1); while(true);");
+        JexlScript e = JEXL.createScript("latch.release(); while(true);");
         final Script.Callable c = (Script.Callable) e.callable(ctxt);
         Object t = 42;
         Callable<Object> kc = new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                latch.release();
+                latch.acquire();
                 return c.cancel();
             }
         };
@@ -96,13 +96,18 @@
 
     @Test
     public void testCallableTimeout() throws Exception {
-        JexlScript e = JEXL.createScript("while(true);");
-        Callable<Object> c = e.callable(null);
+        final Semaphore latch = new Semaphore(0);
+        JexlContext ctxt = new MapContext();
+        ctxt.set("latch", latch);
+
+        JexlScript e = JEXL.createScript("latch.release(); while(true);");
+        Callable<Object> c = e.callable(ctxt);
         Object t = 42;
 
         ExecutorService executor = Executors.newFixedThreadPool(1);
         Future<?> future = executor.submit(c);
         try {
+            latch.acquire();
             t = future.get(100, TimeUnit.MILLISECONDS);
             Assert.fail("should have timed out");
         } catch (TimeoutException xtimeout) {
@@ -266,7 +271,7 @@
         JexlContext ctxt = new TestContext();
         ctxt.set("latch", latch);
 
-        JexlScript e = JEXL.createScript("runForever()");
+        JexlScript e = JEXL.createScript("latch.release(); runForever()");
         Callable<Object> c = e.callable(ctxt);
 
         ExecutorService executor = Executors.newFixedThreadPool(1);
@@ -274,7 +279,7 @@
         Object t = 42;
 
         try {
-            latch.release();
+            latch.acquire();
             t = future.get(100, TimeUnit.MILLISECONDS);
             Assert.fail("should have timed out");
         } catch (TimeoutException xtimeout) {