From 2de32d692918c1cf0643daf598afb129c4a204a1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 26 Jan 2014 05:50:59 +0100 Subject: Rename TestUtils -> MiscUtils (not a test), remove 'main' .. oops --- test/com/jogamp/opencl/CLBufferTest.java | 2 +- test/com/jogamp/opencl/CLCommandQueueTest.java | 2 +- test/com/jogamp/opencl/HighLevelBindingTest.java | 2 +- test/com/jogamp/opencl/LowLevelBindingTest.java | 2 +- test/com/jogamp/opencl/TestUtils.java | 92 ------------------------ test/com/jogamp/opencl/test/util/MiscUtils.java | 80 +++++++++++++++++++++ 6 files changed, 84 insertions(+), 96 deletions(-) delete mode 100644 test/com/jogamp/opencl/TestUtils.java create mode 100644 test/com/jogamp/opencl/test/util/MiscUtils.java (limited to 'test/com/jogamp/opencl') diff --git a/test/com/jogamp/opencl/CLBufferTest.java b/test/com/jogamp/opencl/CLBufferTest.java index 1b9b8357..0638844d 100644 --- a/test/com/jogamp/opencl/CLBufferTest.java +++ b/test/com/jogamp/opencl/CLBufferTest.java @@ -51,8 +51,8 @@ import org.junit.runners.MethodSorters; import static org.junit.Assert.*; import static java.lang.System.*; -import static com.jogamp.opencl.TestUtils.*; import static com.jogamp.common.nio.Buffers.*; +import static com.jogamp.opencl.test.util.MiscUtils.*; import static com.jogamp.opencl.util.CLPlatformFilters.*; import static com.jogamp.opencl.CLVersion.*; diff --git a/test/com/jogamp/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java index cc8a6d82..c9b1b567 100644 --- a/test/com/jogamp/opencl/CLCommandQueueTest.java +++ b/test/com/jogamp/opencl/CLCommandQueueTest.java @@ -53,7 +53,7 @@ import org.junit.Test; import static org.junit.Assert.*; import static java.lang.System.*; -import static com.jogamp.opencl.TestUtils.*; +import static com.jogamp.opencl.test.util.MiscUtils.*; import static com.jogamp.opencl.CLEvent.*; import static com.jogamp.opencl.CLVersion.*; import static com.jogamp.common.nio.Buffers.*; diff --git a/test/com/jogamp/opencl/HighLevelBindingTest.java b/test/com/jogamp/opencl/HighLevelBindingTest.java index bdff8041..6dd6a73f 100644 --- a/test/com/jogamp/opencl/HighLevelBindingTest.java +++ b/test/com/jogamp/opencl/HighLevelBindingTest.java @@ -56,7 +56,7 @@ import org.junit.runners.MethodSorters; import static org.junit.Assert.*; import static java.lang.System.*; -import static com.jogamp.opencl.TestUtils.*; +import static com.jogamp.opencl.test.util.MiscUtils.*; import static com.jogamp.opencl.util.CLPlatformFilters.*; import static com.jogamp.opencl.CLVersion.*; import static com.jogamp.opencl.CLDevice.Type.*; diff --git a/test/com/jogamp/opencl/LowLevelBindingTest.java b/test/com/jogamp/opencl/LowLevelBindingTest.java index a4135b98..2780c07a 100644 --- a/test/com/jogamp/opencl/LowLevelBindingTest.java +++ b/test/com/jogamp/opencl/LowLevelBindingTest.java @@ -57,8 +57,8 @@ import static java.lang.System.*; import static org.junit.Assert.*; import static com.jogamp.common.nio.Buffers.*; import static com.jogamp.common.os.Platform.*; +import static com.jogamp.opencl.test.util.MiscUtils.*; import static com.jogamp.opencl.util.CLUtil.*; -import static com.jogamp.opencl.TestUtils.*; /** * Test testing the low level bindings. diff --git a/test/com/jogamp/opencl/TestUtils.java b/test/com/jogamp/opencl/TestUtils.java deleted file mode 100644 index a5c4e2b3..00000000 --- a/test/com/jogamp/opencl/TestUtils.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2010 JogAmp Community. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of JogAmp Community. - */ - -package com.jogamp.opencl; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Random; - -import org.junit.FixMethodOrder; -import org.junit.runners.MethodSorters; - -import com.jogamp.opencl.test.util.UITestCase; - -import static java.lang.System.*; -import static org.junit.Assert.*; - -/** - * @author Michael Bien, et.al - */ -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class TestUtils extends UITestCase { - - //decrease this value on systems with few memory. - final static int ONE_MB = 1048576; - - final static int NUM_ELEMENTS = 10000000; - - public static final void fillBuffer(ByteBuffer buffer, int seed) { - - Random rnd = new Random(seed); - - while(buffer.remaining() != 0) - buffer.putInt(rnd.nextInt()); - - buffer.rewind(); - } - - public static final int roundUp(int groupSize, int globalSize) { - int r = globalSize % groupSize; - if (r == 0) { - return globalSize; - } else { - return globalSize + groupSize - r; - } - } - - public static final void checkIfEqual(ByteBuffer a, ByteBuffer b, int elements) { - for(int i = 0; i < elements; i++) { - int aVal = a.getInt(); - int bVal = b.getInt(); - if(aVal != bVal) { - out.println("a: "+aVal); - out.println("b: "+bVal); - out.println("position: "+a.position()); - fail("a!=b"); - } - } - a.rewind(); - b.rewind(); - } - - public static void main(String[] args) throws IOException { - String tstname = TestUtils.class.getName(); - org.junit.runner.JUnitCore.main(tstname); - } -} diff --git a/test/com/jogamp/opencl/test/util/MiscUtils.java b/test/com/jogamp/opencl/test/util/MiscUtils.java new file mode 100644 index 00000000..5d74eb45 --- /dev/null +++ b/test/com/jogamp/opencl/test/util/MiscUtils.java @@ -0,0 +1,80 @@ +/* + * Copyright 2010 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + +package com.jogamp.opencl.test.util; + +import java.nio.ByteBuffer; +import java.util.Random; + +import static java.lang.System.*; +import static org.junit.Assert.*; + +/** + * @author Michael Bien, et.al + */ +public class MiscUtils { + + //decrease this value on systems with few memory. + final static int ONE_MB = 1048576; + + final static int NUM_ELEMENTS = 10000000; + + public static final void fillBuffer(ByteBuffer buffer, int seed) { + + Random rnd = new Random(seed); + + while(buffer.remaining() != 0) + buffer.putInt(rnd.nextInt()); + + buffer.rewind(); + } + + public static final int roundUp(int groupSize, int globalSize) { + int r = globalSize % groupSize; + if (r == 0) { + return globalSize; + } else { + return globalSize + groupSize - r; + } + } + + public static final void checkIfEqual(ByteBuffer a, ByteBuffer b, int elements) { + for(int i = 0; i < elements; i++) { + int aVal = a.getInt(); + int bVal = b.getInt(); + if(aVal != bVal) { + out.println("a: "+aVal); + out.println("b: "+bVal); + out.println("position: "+a.position()); + fail("a!=b"); + } + } + a.rewind(); + b.rewind(); + } +} -- cgit v1.2.3