summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-02-09 16:48:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-09 16:48:45 +0000
commitc22ef814851a643d5f60c8c33ccf5a775c3eea90 (patch)
treeccfb88564cab1c7509fe0eff2d8da68fdc421760
parent4bd67ddfa94c49551c311052745a63c38b420246 (diff)
parentf74d4b8da76be4ff555dbf69faa5e8b97fd5f7b6 (diff)
Fix generate_hiddenapi_lists_test.py am: 2019bc53c2 am: f74d4b8da7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580530 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5fb89e043e5ea788f0c30698a3465a82cc43d7c9
-rwxr-xr-xtools/hiddenapi/generate_hiddenapi_lists_test.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/hiddenapi/generate_hiddenapi_lists_test.py b/tools/hiddenapi/generate_hiddenapi_lists_test.py
index 82d117fbbbab..93dbc23b2978 100755
--- a/tools/hiddenapi/generate_hiddenapi_lists_test.py
+++ b/tools/hiddenapi/generate_hiddenapi_lists_test.py
@@ -61,8 +61,8 @@ class TestHiddenapiListGeneration(unittest.TestCase):
self.assertEqual(flags.generate_csv(), [
'A,' + FLAG_UNSUPPORTED,
'B,' + FLAG_BLOCKED + "," + FLAG_MAX_TARGET_O,
- 'C,' + FLAG_SYSTEM_API + ',' + FLAG_SDK,
- 'D,' + FLAG_UNSUPPORTED + ',' + FLAG_TEST_API,
+ 'C,' + FLAG_SDK + ',' + FLAG_SYSTEM_API,
+ 'D,' + FLAG_TEST_API + ',' + FLAG_UNSUPPORTED,
'E,' + FLAG_BLOCKED + ',' + FLAG_TEST_API,
])
@@ -77,7 +77,7 @@ class TestHiddenapiListGeneration(unittest.TestCase):
# Test new additions.
flags.assign_flag(FLAG_UNSUPPORTED, set([ 'A', 'B' ]))
self.assertEqual(flags.generate_csv(),
- [ 'A,' + FLAG_UNSUPPORTED + "," + FLAG_SDK, 'B,' + FLAG_UNSUPPORTED ])
+ [ 'A,' + FLAG_SDK + "," + FLAG_UNSUPPORTED, 'B,' + FLAG_UNSUPPORTED ])
# Test invalid API signature.
with self.assertRaises(AssertionError):