diff options
| author | Yang Ni <yangni@google.com> | 2015-04-07 19:54:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 19:54:47 +0000 |
| commit | e7e7a7d686caa296c89601660aa802e14b1c3c50 (patch) | |
| tree | 0918ee407f027daa2ea8b4e326aee62cc0ce8262 /java | |
| parent | 7c26bc1b36d7fcb18256eabc12e9b2f15a29833d (diff) | |
| parent | fc9dfa0f3cb8fb812e8e47cea0f6217fc4fb4d5b (diff) | |
| download | rs-e7e7a7d686caa296c89601660aa802e14b1c3c50.tar.gz | |
Merge "Updated tests of ScriptGroup2 to include a name"
Diffstat (limited to 'java')
3 files changed, 5 insertions, 3 deletions
diff --git a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java index 1e74e14e..145c8ee4 100644 --- a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java +++ b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java @@ -93,7 +93,7 @@ public class UT_script_group2_gatherscatter extends UnitTest { f = c.getReturn(); } - ScriptGroup2 group = builder.create(c.getReturn()); + ScriptGroup2 group = builder.create("Summation", c.getReturn()); if (c == null) { return; diff --git a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java index c02ae204..3ca7280d 100644 --- a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java +++ b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java @@ -64,7 +64,7 @@ public class UT_script_group2_pointwise extends UnitTest { Type.createX(pRS, Element.I32_4(pRS), ARRAY_SIZE), new Object[]{c0.getReturn()}, map); - ScriptGroup2 group = builder.create(c1.getReturn()); + ScriptGroup2 group = builder.create("AddDouble", c1.getReturn()); int[] a = new int[ARRAY_SIZE * 4]; ((Allocation)group.execute(input)[0]).copyTo(a); diff --git a/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java b/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java index c4f8a76b..3a9561bd 100644 --- a/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java +++ b/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java @@ -412,7 +412,9 @@ public class Filters extends TestBase { mOutPixelsAllocation.getType(), new Object[]{ c.getReturn() }, emptyMap); - mGroup2 = b2.create(c.getReturn()); + final String name = mFilters[0].getClass().getSimpleName() + "-" + + mFilters[1].getClass().getSimpleName(); + mGroup2 = b2.create(name, c.getReturn()); } break; case EMULATED: |