diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-12 01:29:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-12 01:29:51 +0000 |
| commit | 36c35bf759266c6d6bbce72dbc63689fa11a477f (patch) | |
| tree | 85b0863dee86228e199d1feef3559e4537d94a9b | |
| parent | 4f862ce4b2cf62e51341f5721ec5658f1093cf17 (diff) | |
| parent | fbec050d1cae65ec9b25a69e61b5e085196a81dd (diff) | |
| download | cts-36c35bf759266c6d6bbce72dbc63689fa11a477f.tar.gz | |
Merge "DO NOT MERGE: fingerprint: Fix BuildFingerprint" into pie-cts-dev
| -rw-r--r-- | tests/tests/os/src/android/os/cts/BuildVersionTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java index 7839109b6dc..b0bff55ba3e 100644 --- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java +++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java @@ -29,6 +29,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.HashSet; +import java.util.Arrays; +import java.util.List; import java.util.Set; public class BuildVersionTest extends TestCase { @@ -36,7 +38,7 @@ public class BuildVersionTest extends TestCase { private static final String LOG_TAG = "BuildVersionTest"; private static final int EXPECTED_SDK = 28; private static final String EXPECTED_BUILD_VARIANT = "user"; - private static final String EXPECTED_TAG = "release-keys"; + private static final String EXPECTED_KEYS = "release-keys"; private static final String PLATFORM_VERSIONS_FILE = "platform_versions.txt"; @SuppressWarnings("deprecation") @@ -83,7 +85,10 @@ public class BuildVersionTest extends TestCase { String[] buildNumberVariant = fingerprintSegs[4].split(":"); String buildVariant = buildNumberVariant[1]; assertEquals("Variant", EXPECTED_BUILD_VARIANT, buildVariant); - assertEquals("Tag", EXPECTED_TAG, fingerprintSegs[5]); + + List<String> buildTagsList = Arrays.asList(fingerprintSegs[5].split(",")); + boolean containsReleaseKeys = buildTagsList.contains(EXPECTED_KEYS); + assertTrue("Keys", containsReleaseKeys); } private void assertNotEmpty(String value) { |