From 32c7882bb9470e580b9cc4ce2c323b0099061806 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Thu, 19 Apr 2018 22:15:21 -0400
Subject: [PATCH] test(opencl): cleaned up all the ignored codegen tests where
possible. Most can now run.
---
.../codegen/test/Assign2DIntArray.java | 1 -
.../codegen/test/Assign2DIntArrayTest.java | 37 +++++++++++++++++--
.../test/AssignAndPassAsParameterSimple.java | 2 +-
.../AssignAndPassAsParameterSimpleTest.java | 5 +--
.../aparapi/codegen/test/ContinueTorture.java | 2 +-
.../codegen/test/ContinueTortureTest.java | 5 +--
.../test/FirstAssignInExpressionTest.java | 31 ++--------------
.../codegen/test/NonNullCheckTest.java | 31 ++--------------
8 files changed, 45 insertions(+), 69 deletions(-)
diff --git a/src/test/java/com/aparapi/codegen/test/Assign2DIntArray.java b/src/test/java/com/aparapi/codegen/test/Assign2DIntArray.java
index d22c48f4..ca7201c3 100644
--- a/src/test/java/com/aparapi/codegen/test/Assign2DIntArray.java
+++ b/src/test/java/com/aparapi/codegen/test/Assign2DIntArray.java
@@ -22,4 +22,3 @@ public class Assign2DIntArray {
ints[0][0] = 1;
}
}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/src/test/java/com/aparapi/codegen/test/Assign2DIntArrayTest.java b/src/test/java/com/aparapi/codegen/test/Assign2DIntArrayTest.java
index 9ab5bfc4..bf46822a 100644
--- a/src/test/java/com/aparapi/codegen/test/Assign2DIntArrayTest.java
+++ b/src/test/java/com/aparapi/codegen/test/Assign2DIntArrayTest.java
@@ -21,16 +21,45 @@ import org.junit.Test;
public class Assign2DIntArrayTest extends com.aparapi.codegen.CodeGenJUnitBase {
- private static final String[] expectedOpenCL = null;
- private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = ClassParseException.class;
+ private static final String[] expectedOpenCL = {"typedef struct This_s{\n" +
+ " __global int *ints;\n" +
+ " int ints__javaArrayLength0;\n" +
+ " int ints__javaArrayDimension0;\n" +
+ " int ints__javaArrayLength1;\n" +
+ " int ints__javaArrayDimension1;\n" +
+ " int passid;\n" +
+ "}This;\n" +
+ "int get_pass_id(This *this){\n" +
+ " return this->passid;\n" +
+ "}\n" +
+ "__kernel void run(\n" +
+ " __global int *ints, \n" +
+ " int ints__javaArrayLength0, \n" +
+ " int ints__javaArrayDimension0, \n" +
+ " int ints__javaArrayLength1, \n" +
+ " int ints__javaArrayDimension1, \n" +
+ " int passid\n" +
+ "){\n" +
+ " This thisStruct;\n" +
+ " This* this=&thisStruct;\n" +
+ " this->ints = ints;\n" +
+ " this->ints__javaArrayLength0 = ints__javaArrayLength0;\n" +
+ " this->ints__javaArrayDimension0 = ints__javaArrayDimension0;\n" +
+ " this->ints__javaArrayLength1 = ints__javaArrayLength1;\n" +
+ " this->ints__javaArrayDimension1 = ints__javaArrayDimension1;\n" +
+ " this->passid = passid;\n" +
+ " {\n" +
+ " (&this->ints[0 * this->ints__javaArrayDimension0])[0] = 1;\n" +
+ " return;\n" +
+ " }\n" +
+ "}"};
+ private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
- @Ignore
@Test
public void Assign2DIntArrayTest() {
test(com.aparapi.codegen.test.Assign2DIntArray.class, expectedException, expectedOpenCL);
}
- @Ignore
@Test
public void Assign2DIntArrayTestWorksWithCaching() {
test(com.aparapi.codegen.test.Assign2DIntArray.class, expectedException, expectedOpenCL);
diff --git a/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimple.java b/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimple.java
index 7f9673ba..8c62403e 100644
--- a/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimple.java
+++ b/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimple.java
@@ -26,4 +26,4 @@ public class AssignAndPassAsParameterSimple {
actuallyDoIt(z = 1);
}
}
-/**{Throws{ClassParseException}Throws}**/
+/**{Throws{CodeGenException}Throws}**/
diff --git a/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimpleTest.java b/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimpleTest.java
index f7563355..efff6cd5 100644
--- a/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimpleTest.java
+++ b/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimpleTest.java
@@ -16,21 +16,20 @@
package com.aparapi.codegen.test;
import com.aparapi.internal.exception.ClassParseException;
+import com.aparapi.internal.exception.CodeGenException;
import org.junit.Ignore;
import org.junit.Test;
public class AssignAndPassAsParameterSimpleTest extends com.aparapi.codegen.CodeGenJUnitBase {
private static final String[] expectedOpenCL = null;
- private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = ClassParseException.class;
+ private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = CodeGenException.class;
- @Ignore
@Test
public void AssignAndPassAsParameterSimpleTest() {
test(com.aparapi.codegen.test.AssignAndPassAsParameterSimple.class, expectedException, expectedOpenCL);
}
- @Ignore
@Test
public void AssignAndPassAsParameterSimpleTestWorksWithCaching() {
test(com.aparapi.codegen.test.AssignAndPassAsParameterSimple.class, expectedException, expectedOpenCL);
diff --git a/src/test/java/com/aparapi/codegen/test/ContinueTorture.java b/src/test/java/com/aparapi/codegen/test/ContinueTorture.java
index fe646da6..b172b17c 100644
--- a/src/test/java/com/aparapi/codegen/test/ContinueTorture.java
+++ b/src/test/java/com/aparapi/codegen/test/ContinueTorture.java
@@ -49,4 +49,4 @@ public class ContinueTorture {
}
}
}
-//**{Throws{ClassParseException}Throws}**/
+//**{Throws{CodeGenException}Throws}**/
diff --git a/src/test/java/com/aparapi/codegen/test/ContinueTortureTest.java b/src/test/java/com/aparapi/codegen/test/ContinueTortureTest.java
index c7ece95b..bdbfc9cb 100644
--- a/src/test/java/com/aparapi/codegen/test/ContinueTortureTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ContinueTortureTest.java
@@ -16,20 +16,19 @@
package com.aparapi.codegen.test;
import com.aparapi.internal.exception.ClassParseException;
+import com.aparapi.internal.exception.CodeGenException;
import org.junit.Ignore;
import org.junit.Test;
public class ContinueTortureTest extends com.aparapi.codegen.CodeGenJUnitBase {
private static final String[] expectedOpenCL = null;
- private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = ClassParseException.class;
+ private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = CodeGenException.class;
- @Ignore
@Test
public void ContinueTortureTest() {
test(com.aparapi.codegen.test.ContinueTorture.class, expectedException, expectedOpenCL);
}
- @Ignore
@Test
public void ContinueTortureTestWorksWithCaching() {
test(com.aparapi.codegen.test.ContinueTorture.class, expectedException, expectedOpenCL);
diff --git a/src/test/java/com/aparapi/codegen/test/FirstAssignInExpressionTest.java b/src/test/java/com/aparapi/codegen/test/FirstAssignInExpressionTest.java
index 285b934b..ecc5b660 100644
--- a/src/test/java/com/aparapi/codegen/test/FirstAssignInExpressionTest.java
+++ b/src/test/java/com/aparapi/codegen/test/FirstAssignInExpressionTest.java
@@ -15,44 +15,19 @@
*/
package com.aparapi.codegen.test;
+import com.aparapi.internal.exception.CodeGenException;
import org.junit.Ignore;
import org.junit.Test;
public class FirstAssignInExpressionTest extends com.aparapi.codegen.CodeGenJUnitBase {
- private static final String[] expectedOpenCL = {
- "typedef struct This_s{\n" +
-"\n" +
-" int passid;\n" +
-" }This;\n" +
-" int get_pass_id(This *this){\n" +
-" return this->passid;\n" +
-" }\n" +
-"\n" +
-" void func(This *this, int _arg){\n" +
-" return;\n" +
-" }\n" +
-" __kernel void run(\n" +
-" int passid\n" +
-" ){\n" +
-" This thisStruct;\n" +
-" This* this=&thisStruct;\n" +
-" this->passid = passid;\n" +
-" {\n" +
-" int result;\n" +
-" func(this, result = 0);\n" +
-" return;\n" +
-" }\n" +
-" }\n" +
-" "};
- private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
+ private static final String[] expectedOpenCL = null;
+ private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = CodeGenException.class;
- @Ignore
@Test
public void FirstAssignInExpressionTest() {
test(com.aparapi.codegen.test.FirstAssignInExpression.class, expectedException, expectedOpenCL);
}
- @Ignore
@Test
public void FirstAssignInExpressionTestWorksWithCaching() {
test(com.aparapi.codegen.test.FirstAssignInExpression.class, expectedException, expectedOpenCL);
diff --git a/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java b/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java
index 8d701650..c43708d3 100644
--- a/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java
+++ b/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java
@@ -15,45 +15,20 @@
*/
package com.aparapi.codegen.test;
+import com.aparapi.internal.exception.CodeGenException;
import org.junit.Ignore;
import org.junit.Test;
public class NonNullCheckTest extends com.aparapi.codegen.CodeGenJUnitBase {
- private static final String[] expectedOpenCL = {
- "typedef struct This_s{\n"
- + " __global int *ints;\n"
- + " int passid;\n"
- + " }This;\n"
- + " int get_pass_id(This *this){\n"
- + " return this->passid;\n"
- + " }\n"
- + "\n"
- + " __kernel void run(\n"
- + " __global int *ints,\n"
- + " int passid\n"
- + " ){\n"
- + " This thisStruct;\n"
- + " This* this=&thisStruct;\n"
- + " this->ints = ints;\n"
- + " this->passid = passid;\n"
- + " {\n"
- + " if (this->ints != NULL){\n"
- + " int value = this->ints[0];\n"
- + " }\n"
- + " return;\n"
- + " }\n"
- + " }\n"
- + " "};
- private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
+ private static final String[] expectedOpenCL = null;
+ private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = CodeGenException.class;
- @Ignore
@Test
public void NonNullCheckTest() {
test(com.aparapi.codegen.test.NonNullCheck.class, expectedException, expectedOpenCL);
}
- @Ignore
@Test
public void NonNullCheckTestWorksWithCaching() {
test(com.aparapi.codegen.test.NonNullCheck.class, expectedException, expectedOpenCL);
--
GitLab