1 files changed, 11 insertions, 12 deletions

diff --git a/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java b/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java
index 2db47061c9e..15a509d25e3 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/CbrtTest.java
@@ -21,25 +21,28 @@ import android.renderscript.RSRuntimeException;
 import com.android.cts.stub.R;
 
 public class CbrtTest extends RSBaseCompute {
-    private ScriptC_cbrt_f32 mscript_f32;
-    private ScriptC_cbrt_f32_2 mscript_f32_2;
-    private ScriptC_cbrt_f32_3 mscript_f32_3;
-    private ScriptC_cbrt_f32_4 mscript_f32_4;
+    private ScriptC_cbrt_f32 script_f32;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        script_f32 = new ScriptC_cbrt_f32(mRS);
+    }
 
     @Override
     public void forEach(int testId, Allocation mIn, Allocation mOut) throws RSRuntimeException {
         switch (testId) {
         case TEST_F32:
-            mscript_f32.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_1(mIn, mOut);
             break;
         case TEST_F32_2:
-            mscript_f32_2.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_2(mIn, mOut);
             break;
         case TEST_F32_3:
-            mscript_f32_3.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_3(mIn, mOut);
             break;
         case TEST_F32_4:
-            mscript_f32_4.forEach_root(mIn, mOut);
+            script_f32.forEach_cbrt_f32_4(mIn, mOut);
             break;
         }
     }
@@ -58,22 +61,18 @@ public class CbrtTest extends RSBaseCompute {
     }
 
     public void testCbrtF32() {
-        mscript_f32 = new ScriptC_cbrt_f32(mRS, mRes, R.raw.cbrt_f32);
         doF32(0xabe, 2);
     }
 
     public void testCbrtF32_2() {
-        mscript_f32_2 = new ScriptC_cbrt_f32_2(mRS, mRes, R.raw.cbrt_f32_2);
         doF32_2(0x78, 2);
     }
 
     public void testCbrtF32_3() {
-        mscript_f32_3 = new ScriptC_cbrt_f32_3(mRS, mRes, R.raw.cbrt_f32_3);
         doF32_3(0x1e, 2);
     }
 
     public void testCbrtF32_4() {
-        mscript_f32_4 = new ScriptC_cbrt_f32_4(mRS, mRes, R.raw.cbrt_f32_4);
         doF32_4(0xfe2, 2);
     }
 }