summaryrefslogtreecommitdiffstats
path: root/test/com/jogamp/opencl/CLCommandQueueTest.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-01-25 15:03:04 +0100
committerSven Gothel <[email protected]>2014-01-25 15:03:04 +0100
commitf51d6456ab2196bf8ce7d6b3c7ac6d71e9e0108b (patch)
tree27f793cb02a09b4735b5b379dc9ae18e8df43ee5 /test/com/jogamp/opencl/CLCommandQueueTest.java
parent1bc4f882be2c8129521b1110e52bcda9c232f8f1 (diff)
parent9ecc606bce374ea093c6321f2d4921b5019a0b18 (diff)
Merge remote-tracking branch 'wwalker/bug_884_replace_netbeans_build_with_jogamp_standard_build'
Diffstat (limited to 'test/com/jogamp/opencl/CLCommandQueueTest.java')
-rw-r--r--test/com/jogamp/opencl/CLCommandQueueTest.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/com/jogamp/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java
index 57689818..a83acda2 100644
--- a/test/com/jogamp/opencl/CLCommandQueueTest.java
+++ b/test/com/jogamp/opencl/CLCommandQueueTest.java
@@ -29,7 +29,6 @@
package com.jogamp.opencl;
import org.junit.Rule;
-import org.junit.rules.MethodRule;
import org.junit.rules.Timeout;
import java.util.concurrent.CountDownLatch;
import com.jogamp.opencl.util.MultiQueueBarrier;
@@ -59,9 +58,8 @@ import static com.jogamp.opencl.CLCommandQueue.Mode.*;
*/
public class CLCommandQueueTest {
- @SuppressWarnings("deprecation")
@Rule
- public MethodRule methodTimeout= (MethodRule) new Timeout(20000);
+ public Timeout methodTimeout = new Timeout(20000);
@Test
public void enumsTest() {