Merge "Add simple tests for all vector types in RS API."
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
index 8d24227..d1254cc 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
@@ -22,6 +22,10 @@
import android.renderscript.Byte3;
import android.renderscript.Byte4;
+import android.renderscript.Double2;
+import android.renderscript.Double3;
+import android.renderscript.Double4;
+
import android.renderscript.Float2;
import android.renderscript.Float3;
import android.renderscript.Float4;
@@ -46,15 +50,52 @@
Byte2 b2 = new Byte2();
b2.x = 1;
b2.y = 2;
+ b2 = new Byte2((byte)1, (byte)2);
+ assertTrue(b2.x == 1);
+ assertTrue(b2.y == 2);
Byte3 b3 = new Byte3();
b3.x = 1;
b3.y = 2;
b3.z = 2;
+ b3 = new Byte3((byte)1, (byte)2, (byte)3);
+ assertTrue(b3.x == 1);
+ assertTrue(b3.y == 2);
+ assertTrue(b3.z == 3);
Byte4 b4 = new Byte4();
b4.x = 1;
b4.y = 2;
b4.x = 3;
b4.w = 4;
+ b4 = new Byte4((byte)1, (byte)2, (byte)3, (byte)4);
+ assertTrue(b4.x == 1);
+ assertTrue(b4.y == 2);
+ assertTrue(b4.z == 3);
+ assertTrue(b4.w == 4);
+
+ Double2 d2 = new Double2();
+ d2.x = 1.0;
+ d2.y = 2.0;
+ d2 = new Double2(1.0, 2.0);
+ assertTrue(d2.x == 1.0);
+ assertTrue(d2.y == 2.0);
+ Double3 d3 = new Double3();
+ d3.x = 1.0;
+ d3.y = 2.0;
+ d3.z = 3.0;
+ d3 = new Double3(1.0, 2.0, 3.0);
+ assertTrue(d3.x == 1.0);
+ assertTrue(d3.y == 2.0);
+ assertTrue(d3.z == 3.0);
+ Double4 d4 = new Double4();
+ d4.x = 1.0;
+ d4.y = 2.0;
+ d4.x = 3.0;
+ d4.w = 4.0;
+ d4 = new Double4(1.0, 2.0, 3.0, 4.0);
+ assertTrue(d4.x == 1.0);
+ assertTrue(d4.y == 2.0);
+ assertTrue(d4.z == 3.0);
+ assertTrue(d4.w == 4.0);
Float2 f2 = new Float2();
f2.x = 1.0f;
@@ -84,41 +125,77 @@
Int2 i2 = new Int2();
i2.x = 1;
i2.y = 2;
+ i2 = new Int2(1, 2);
+ assertTrue(i2.x == 1);
+ assertTrue(i2.y == 2);
Int3 i3 = new Int3();
i3.x = 1;
i3.y = 2;
i3.z = 3;
+ i3 = new Int3(1, 2, 3);
+ assertTrue(i3.x == 1);
+ assertTrue(i3.y == 2);
+ assertTrue(i3.z == 3);
Int4 i4 = new Int4();
i4.x = 1;
i4.y = 2;
i4.x = 3;
i4.w = 4;
+ i4 = new Int4(1, 2, 3, 4);
+ assertTrue(i4.x == 1);
+ assertTrue(i4.y == 2);
+ assertTrue(i4.z == 3);
+ assertTrue(i4.w == 4);
Long2 l2 = new Long2();
l2.x = 1;
l2.y = 2;
+ l2 = new Long2(1, 2);
+ assertTrue(l2.x == 1);
+ assertTrue(l2.y == 2);
Long3 l3 = new Long3();
l3.x = 1;
l3.y = 2;
l3.z = 3;
+ l3 = new Long3(1, 2, 3);
+ assertTrue(l3.x == 1);
+ assertTrue(l3.y == 2);
+ assertTrue(l3.z == 3);
Long4 l4 = new Long4();
l4.x = 1;
l4.y = 2;
l4.x = 3;
l4.w = 4;
+ l4 = new Long4(1, 2, 3, 4);
+ assertTrue(l4.x == 1);
+ assertTrue(l4.y == 2);
+ assertTrue(l4.z == 3);
+ assertTrue(l4.w == 4);
Short2 s2 = new Short2();
s2.x = 1;
s2.y = 2;
+ s2 = new Short2((short)1, (short)2);
+ assertTrue(s2.x == 1);
+ assertTrue(s2.y == 2);
Short3 s3 = new Short3();
s3.x = 1;
s3.y = 2;
s3.z = 3;
+ s3 = new Short3((short)1, (short)2, (short)3);
+ assertTrue(s3.x == 1);
+ assertTrue(s3.y == 2);
+ assertTrue(s3.z == 3);
Short4 s4 = new Short4();
s4.x = 1;
s4.y = 2;
s4.x = 3;
s4.w = 4;
+ s4 = new Short4((short)1, (short)2, (short)3, (short)4);
+ assertTrue(s4.x == 1);
+ assertTrue(s4.y == 2);
+ assertTrue(s4.z == 3);
+ assertTrue(s4.w == 4);
}
private boolean initializeGlobals(ScriptC_primitives s) {