Drop useless MiscTestUtils

Author: ochafik

Core/src/test/java/com/nativelibs4java/opencl/AbstractCommon.java

@@ -8,7 +8,6 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import com.nativelibs4java.test.MiscTestUtils;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.After;
@@ -27,12 +26,6 @@ public abstract class AbstractCommon {
 	CLQueue queue;
 	CLDevice device;
 	CLImageFormat[] formatsRead2D, formatsRead3D, formatsWrite2D, formatsWrite3D, formatsReadWrite2D, formatsReadWrite3D;
-	/*
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
-    }
-    */
 
     static boolean listedPlatforms;
 
@@ -68,4 +61,4 @@ public void cleanup() {
         platform.release();
     }    
     */
-}
+}

Core/src/test/java/com/nativelibs4java/opencl/BinaryKernelTest.java

@@ -8,7 +8,6 @@
 
 import org.bridj.Pointer;
 import static org.bridj.Pointer.*;
-import com.nativelibs4java.test.MiscTestUtils;
 import java.util.List;
 import org.junit.Ignore;
 import org.junit.runners.Parameterized;
@@ -81,4 +80,4 @@ public void cachingTest() {
         sp2.setCached(true); // set to false and it works
         sp2.createKernel("sub");
     }
-}
+}

Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java

@@ -15,7 +15,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.nativelibs4java.test.MiscTestUtils;
 import com.nativelibs4java.util.NIOUtils;
 import org.bridj.*;
 import java.nio.ByteOrder;

Core/src/test/java/com/nativelibs4java/opencl/ByteOrderHackTest.java

@@ -8,7 +8,6 @@
 
 import org.bridj.Pointer;
 import static org.bridj.Pointer.*;
-import com.nativelibs4java.test.MiscTestUtils;
 import java.util.List;
 import org.junit.runners.Parameterized;
 

Core/src/test/java/com/nativelibs4java/opencl/EventTest.java

@@ -8,7 +8,6 @@
 
 import org.bridj.Pointer;
 import static org.bridj.Pointer.*;
-import com.nativelibs4java.test.MiscTestUtils;
 import java.util.List;
 import org.junit.runners.Parameterized;
 

Core/src/test/java/com/nativelibs4java/opencl/InfoGettersTest.java

@@ -4,7 +4,6 @@
  */
 package com.nativelibs4java.opencl;
 
-import static com.nativelibs4java.test.MiscTestUtils.testGetters;
 import static org.junit.Assert.assertFalse;
 
 import java.util.logging.Level;
@@ -13,8 +12,6 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import com.nativelibs4java.test.MiscTestUtils;
-
 /**
  *
  * @author ochafik
@@ -124,4 +121,45 @@ public void CLEventGetters() {
     public void CLSamplerGetters() {
         testGetters(createSampler());
     }
+
+    public static void testGetters(Object instance) {
+      if (instance == null)
+          return;
+      Logger log = Logger.getLogger(instance.getClass().getName());
+      for (Method m : instance.getClass().getDeclaredMethods()) {
+        if (Modifier.isStatic(m.getModifiers()))
+          continue;
+        if (!Modifier.isPublic(m.getModifiers()))
+          continue;
+        if (m.getParameterTypes().length != 0)
+          continue;
+
+        String name = m.getName();
+        if (name.contains("ProfilingCommand"))
+          continue;
+        
+        boolean isToString = name.equals("toString");
+        if (name.startsWith("get") && name.length() > 3 ||
+            name.startsWith("has") && name.length() > 3 ||
+            name.startsWith("is") && name.length() > 2 ||
+            isToString && !Modifier.isPublic(m.getDeclaringClass().getModifiers()))
+        {
+          String msg = "Failed to call " + m;
+          try {
+            m.invoke(instance);
+          } catch (IllegalAccessException ex) {
+            if (!isToString)
+              log.log(Level.WARNING, msg, ex);
+          } catch (InvocationTargetException ex) {
+            Throwable cause = ex.getCause();
+            if (!(cause instanceof UnsupportedOperationException)) {
+              log.log(Level.SEVERE, msg, ex.getCause());
+              assertFalse(msg, true);
+            }
+          } catch (Exception ex) {
+            log.log(Level.SEVERE, msg, ex);
+          }
+        }
+      }
+    }
 }

Core/src/test/java/com/nativelibs4java/opencl/KernelTest.java

@@ -43,7 +43,7 @@ public <T> Object testArrayArg(String type, Object array, Class<T> targetType) {
         CLBuffer<Byte> out = context.createByteBuffer(Usage.Output, size * length);
         StringBuilder b = new StringBuilder(
             "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n" +
-            "kernel void f(" + type + length + " arg, global " + type + "* out, long length) {\n");
+            "kernel void f(constant " + type + length + " arg, global " + type + "* out, long length) {\n");
         for (long i = 0; i < length; i++) {
             b.append("out[" + i + "] = arg.s" + (i < 10 ? i + "" : ((char)((int)'a' + (i - 10))) + "") + ";\n");
         }

Core/src/test/java/com/nativelibs4java/opencl/OpenCL4JavaBasicTest.java

@@ -12,7 +12,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.nativelibs4java.test.MiscTestUtils;
 import com.nativelibs4java.util.NIOUtils;
 
 public class OpenCL4JavaBasicTest {

Core/src/test/java/com/nativelibs4java/opencl/OpenCL4JavaBenchmarkTest.java

@@ -18,7 +18,6 @@
 
 import com.nativelibs4java.opencl.CLTestUtils.Action2;
 import com.nativelibs4java.opencl.CLTestUtils.ExecResult;
-import com.nativelibs4java.test.MiscTestUtils;
 
 //import com.nativelibs4java.scalacl.*;
 /// @see http://ati.amd.com/technology/streamcomputing/intro_opencl.html#simple

Core/src/test/java/com/nativelibs4java/opencl/OverheadTest.java

@@ -13,7 +13,6 @@
 import org.bridj.Pointer;
 import org.bridj.Platform;
 import static org.bridj.Pointer.*;
-import com.nativelibs4java.test.MiscTestUtils;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -157,4 +156,4 @@ public void run() {
         assertTrue("CLKernel.setArg was supposed not to be more than " + maxSlower + "x slower than hand-optimized version, was " + slowerSetArg + "x slower.", slowerSetArg <= maxSlower);
         assertTrue("CLKernel.setArgs was supposed not to be more than " + maxSlower + "x slower than hand-optimized version, was " + slowerSetArgs + "x slower.", slowerSetArgs <= maxSlower);
     }
-}
+}