From 9ecc606bce374ea093c6321f2d4921b5019a0b18 Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Sun, 15 Dec 2013 16:16:18 -0600
Subject: Bug 884: Add standard JogAmp build files.

The new make/build.xml successfully builds and tests the project. The
original NetBeans build files are still present, but won't work anymore
since the resources directory is now inside the make directory. The new
build files are based on those of JOAL. The new build is not yet minimized
and cleaned up, because this commit is meant to be the minimum way to get
things functional.
---
 test/com/jogamp/opencl/CLCommandQueueTest.java                 | 4 +---
 test/com/jogamp/opencl/util/concurrent/CLMultiContextTest.java | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'test/com/jogamp')

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() {
diff --git a/test/com/jogamp/opencl/util/concurrent/CLMultiContextTest.java b/test/com/jogamp/opencl/util/concurrent/CLMultiContextTest.java
index 81d34907..818827c6 100644
--- a/test/com/jogamp/opencl/util/concurrent/CLMultiContextTest.java
+++ b/test/com/jogamp/opencl/util/concurrent/CLMultiContextTest.java
@@ -16,7 +16,6 @@ import java.nio.IntBuffer;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import org.junit.Rule;
-import org.junit.rules.MethodRule;
 import org.junit.rules.Timeout;
 import com.jogamp.opencl.util.CLMultiContext;
 import java.nio.Buffer;
@@ -34,7 +33,7 @@ import static java.lang.System.*;
 public class CLMultiContextTest {
 
     @Rule
-    public MethodRule methodTimeout= new Timeout(10000);
+    public Timeout methodTimeout= new Timeout(10000);
 
     @Test
     public void createMultiContextTest() {
-- 
cgit v1.2.3