Refactor error checking on script/control side.
Change-Id: Id135a065b4d714bb1fe5bb18fd209f7914ab790e
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
index dc21583..22ceb8b 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2011-2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -321,7 +321,7 @@
assertTrue(initializeGlobals(t));
t.invoke_test();
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
/**
@@ -333,7 +333,7 @@
R.raw.utils);
t.invoke_test();
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
void setUpAllocation(Allocation a, int val) {
@@ -383,5 +383,6 @@
fail("should throw RSRuntimeException");
} catch (RSRuntimeException e) {
}
+ checkForErrors();
}
}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RSBase.java b/tests/tests/renderscript/src/android/renderscript/cts/RSBase.java
index c51cfb8..29183f0 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RSBase.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RSBase.java
@@ -33,11 +33,11 @@
Context mCtx;
Resources mRes;
- public int result;
+ private int result;
private boolean msgHandled;
- public static final int RS_MSG_TEST_PASSED = 100;
- public static final int RS_MSG_TEST_FAILED = 101;
+ private static final int RS_MSG_TEST_PASSED = 100;
+ private static final int RS_MSG_TEST_FAILED = 101;
RSMessageHandler mRsMessage = new RSMessageHandler() {
public void run() {
@@ -80,4 +80,12 @@
mCtx = getContext();
mRes = mCtx.getResources();
}
+
+ /**
+ * Verify that we didn't fail on the control or script side of things.
+ */
+ protected void checkForErrors() {
+ assertFalse(FoundError);
+ assertTrue(result != RS_MSG_TEST_FAILED);
+ }
}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/StructArrayTest.java b/tests/tests/renderscript/src/android/renderscript/cts/StructArrayTest.java
index f9feb37..6003ca9 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/StructArrayTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/StructArrayTest.java
@@ -33,7 +33,6 @@
pad.bind_s(S);
pad.invoke_verify();
waitForMessage();
- assertFalse(FoundError);
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/StructPadTest.java b/tests/tests/renderscript/src/android/renderscript/cts/StructPadTest.java
index 58d6936..c56c086 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/StructPadTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/StructPadTest.java
@@ -45,6 +45,6 @@
pad.set_s(I);
pad.invoke_verify();
waitForMessage();
- assertFalse(FoundError);
+ checkForErrors();
}
}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java b/tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java
index 32f884a..6c6eb79 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java
@@ -30,7 +30,7 @@
R.raw.set_target_api_11);
test11.invoke_check(11);
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
public void testVersion12() {
@@ -40,7 +40,7 @@
R.raw.set_target_api_12);
test12.invoke_check(12);
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
public void testVersion13() {
@@ -50,7 +50,7 @@
R.raw.set_target_api_13);
test13.invoke_check(13);
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
public void testVersion14() {
@@ -60,7 +60,7 @@
R.raw.set_target_api_14);
test14.invoke_check(14);
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
public void testVersion15() {
@@ -70,6 +70,6 @@
R.raw.set_target_api_15);
test15.invoke_check(15);
waitForMessage();
- assertEquals(RS_MSG_TEST_PASSED, result);
+ checkForErrors();
}
}
