Merge "Test new vector classes for RS Element."
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java
index 738e8e3..4f8185a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java
@@ -72,15 +72,41 @@
assertTrue(Element.F32_3(mRS) != null);
assertTrue(Element.F32_4(mRS) != null);
assertTrue(Element.F64(mRS) != null);
+ assertTrue(Element.F64_2(mRS) != null);
+ assertTrue(Element.F64_3(mRS) != null);
+ assertTrue(Element.F64_4(mRS) != null);
assertTrue(Element.I8(mRS) != null);
+ assertTrue(Element.I8_2(mRS) != null);
+ assertTrue(Element.I8_3(mRS) != null);
+ assertTrue(Element.I8_4(mRS) != null);
assertTrue(Element.I16(mRS) != null);
+ assertTrue(Element.I16_2(mRS) != null);
+ assertTrue(Element.I16_3(mRS) != null);
+ assertTrue(Element.I16_4(mRS) != null);
assertTrue(Element.I32(mRS) != null);
+ assertTrue(Element.I32_2(mRS) != null);
+ assertTrue(Element.I32_3(mRS) != null);
+ assertTrue(Element.I32_4(mRS) != null);
assertTrue(Element.I64(mRS) != null);
+ assertTrue(Element.I64_2(mRS) != null);
+ assertTrue(Element.I64_3(mRS) != null);
+ assertTrue(Element.I64_4(mRS) != null);
assertTrue(Element.U8(mRS) != null);
+ assertTrue(Element.U8_2(mRS) != null);
+ assertTrue(Element.U8_3(mRS) != null);
assertTrue(Element.U8_4(mRS) != null);
assertTrue(Element.U16(mRS) != null);
+ assertTrue(Element.U16_2(mRS) != null);
+ assertTrue(Element.U16_3(mRS) != null);
+ assertTrue(Element.U16_4(mRS) != null);
assertTrue(Element.U32(mRS) != null);
+ assertTrue(Element.U32_2(mRS) != null);
+ assertTrue(Element.U32_3(mRS) != null);
+ assertTrue(Element.U32_4(mRS) != null);
assertTrue(Element.U64(mRS) != null);
+ assertTrue(Element.U64_2(mRS) != null);
+ assertTrue(Element.U64_3(mRS) != null);
+ assertTrue(Element.U64_4(mRS) != null);
assertTrue(Element.MATRIX_2X2(mRS) != null);
assertTrue(Element.MATRIX_3X3(mRS) != null);
assertTrue(Element.MATRIX_4X4(mRS) != null);
@@ -250,15 +276,41 @@
eb.add(Element.F32_3(mRS), "F32_3", arraySize);
eb.add(Element.F32_4(mRS), "F32_4", arraySize);
eb.add(Element.F64(mRS), "F64", arraySize);
+ eb.add(Element.F64_2(mRS), "F64_2", arraySize);
+ eb.add(Element.F64_3(mRS), "F64_3", arraySize);
+ eb.add(Element.F64_4(mRS), "F64_4", arraySize);
eb.add(Element.I8(mRS), "I8", arraySize);
+ eb.add(Element.I8_2(mRS), "I8_2", arraySize);
+ eb.add(Element.I8_3(mRS), "I8_3", arraySize);
+ eb.add(Element.I8_4(mRS), "I8_4", arraySize);
eb.add(Element.I16(mRS), "I16", arraySize);
+ eb.add(Element.I16_2(mRS), "I16_2", arraySize);
+ eb.add(Element.I16_3(mRS), "I16_3", arraySize);
+ eb.add(Element.I16_4(mRS), "I16_4", arraySize);
eb.add(Element.I32(mRS), "I32", arraySize);
+ eb.add(Element.I32_2(mRS), "I32_2", arraySize);
+ eb.add(Element.I32_3(mRS), "I32_3", arraySize);
+ eb.add(Element.I32_4(mRS), "I32_4", arraySize);
eb.add(Element.I64(mRS), "I64", arraySize);
+ eb.add(Element.I64_2(mRS), "I64_2", arraySize);
+ eb.add(Element.I64_3(mRS), "I64_3", arraySize);
+ eb.add(Element.I64_4(mRS), "I64_4", arraySize);
eb.add(Element.U8(mRS), "U8", arraySize);
+ eb.add(Element.U8_2(mRS), "U8_2", arraySize);
+ eb.add(Element.U8_3(mRS), "U8_3", arraySize);
eb.add(Element.U8_4(mRS), "U8_4", arraySize);
eb.add(Element.U16(mRS), "U16", arraySize);
+ eb.add(Element.U16_2(mRS), "U16_2", arraySize);
+ eb.add(Element.U16_3(mRS), "U16_3", arraySize);
+ eb.add(Element.U16_4(mRS), "U16_4", arraySize);
eb.add(Element.U32(mRS), "U32", arraySize);
+ eb.add(Element.U32_2(mRS), "U32_2", arraySize);
+ eb.add(Element.U32_3(mRS), "U32_3", arraySize);
+ eb.add(Element.U32_4(mRS), "U32_4", arraySize);
eb.add(Element.U64(mRS), "U64", arraySize);
+ eb.add(Element.U64_2(mRS), "U64_2", arraySize);
+ eb.add(Element.U64_3(mRS), "U64_3", arraySize);
+ eb.add(Element.U64_4(mRS), "U64_4", arraySize);
eb.add(Element.MATRIX_2X2(mRS), "MATRIX_2X2", arraySize);
eb.add(Element.MATRIX_3X3(mRS), "MATRIX_3X3", arraySize);
eb.add(Element.MATRIX_4X4(mRS), "MATRIX_4X4", arraySize);
@@ -290,15 +342,41 @@
assertFalse(Element.F32_3(mRS).isComplex());
assertFalse(Element.F32_4(mRS).isComplex());
assertFalse(Element.F64(mRS).isComplex());
+ assertFalse(Element.F64_2(mRS).isComplex());
+ assertFalse(Element.F64_3(mRS).isComplex());
+ assertFalse(Element.F64_4(mRS).isComplex());
assertFalse(Element.I8(mRS).isComplex());
+ assertFalse(Element.I8_2(mRS).isComplex());
+ assertFalse(Element.I8_3(mRS).isComplex());
+ assertFalse(Element.I8_4(mRS).isComplex());
assertFalse(Element.I16(mRS).isComplex());
+ assertFalse(Element.I16_2(mRS).isComplex());
+ assertFalse(Element.I16_3(mRS).isComplex());
+ assertFalse(Element.I16_4(mRS).isComplex());
assertFalse(Element.I32(mRS).isComplex());
+ assertFalse(Element.I32_2(mRS).isComplex());
+ assertFalse(Element.I32_3(mRS).isComplex());
+ assertFalse(Element.I32_4(mRS).isComplex());
assertFalse(Element.I64(mRS).isComplex());
+ assertFalse(Element.I64_2(mRS).isComplex());
+ assertFalse(Element.I64_3(mRS).isComplex());
+ assertFalse(Element.I64_4(mRS).isComplex());
assertFalse(Element.U8(mRS).isComplex());
+ assertFalse(Element.U8_2(mRS).isComplex());
+ assertFalse(Element.U8_3(mRS).isComplex());
assertFalse(Element.U8_4(mRS).isComplex());
assertFalse(Element.U16(mRS).isComplex());
+ assertFalse(Element.U16_2(mRS).isComplex());
+ assertFalse(Element.U16_3(mRS).isComplex());
+ assertFalse(Element.U16_4(mRS).isComplex());
assertFalse(Element.U32(mRS).isComplex());
+ assertFalse(Element.U32_2(mRS).isComplex());
+ assertFalse(Element.U32_3(mRS).isComplex());
+ assertFalse(Element.U32_4(mRS).isComplex());
assertFalse(Element.U64(mRS).isComplex());
+ assertFalse(Element.U64_2(mRS).isComplex());
+ assertFalse(Element.U64_3(mRS).isComplex());
+ assertFalse(Element.U64_4(mRS).isComplex());
assertFalse(Element.MATRIX_2X2(mRS).isComplex());
assertFalse(Element.MATRIX_3X3(mRS).isComplex());
assertFalse(Element.MATRIX_4X4(mRS).isComplex());
