StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch signature_to_elements to use tuple"

Browse Source
This commit is contained in:
Paul Duffin
2022-03-16 10:54:21 +00:00
committed by Gerrit Code Review
parent 6104b25b72 ea93542e90
commit f8ccd16516
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/hiddenapi/signature_trie.py
View File

@@ -156,16 +156,16 @@ class InteriorNode(Node):
# 3 - class:UnicodeScript # 3 - class:UnicodeScript
# 4 - member:of(I)Ljava/lang/Character$UnicodeScript; # 4 - member:of(I)Ljava/lang/Character$UnicodeScript;
return list( return list(
chain([f"package:{x}" for x in packages], chain([("package", x) for x in packages],
[f"class:{x}" for x in classes], [("class", x) for x in classes],
[f"member:{x}" for x in member], [("member", x) for x in member],
[f"wildcard:{x}" for x in wildcard])) [("wildcard", x) for x in wildcard]))
# pylint: enable=line-too-long # pylint: enable=line-too-long
@staticmethod @staticmethod
def split_element(element): def split_element(element):
element_type, element_value = element.split(":", 1) element_type, element_value = element
return element_type, element_value return element_type, element_value
@staticmethod @staticmethod

64
scripts/hiddenapi/signature_trie_test.py
View File

@@ -29,34 +29,34 @@ class TestSignatureToElements(unittest.TestCase):
def test_nested_inner_classes(self): def test_nested_inner_classes(self):
elements = [ elements = [
"package:java", ("package", "java"),
"package:lang", ("package", "lang"),
"class:ProcessBuilder", ("class", "ProcessBuilder"),
"class:Redirect", ("class", "Redirect"),
"class:1", ("class", "1"),
"member:<init>()V", ("member", "<init>()V"),
] ]
signature = "Ljava/lang/ProcessBuilder$Redirect$1;-><init>()V" signature = "Ljava/lang/ProcessBuilder$Redirect$1;-><init>()V"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
def test_basic_member(self): def test_basic_member(self):
elements = [ elements = [
"package:java", ("package", "java"),
"package:lang", ("package", "lang"),
"class:Object", ("class", "Object"),
"member:hashCode()I", ("member", "hashCode()I"),
] ]
signature = "Ljava/lang/Object;->hashCode()I" signature = "Ljava/lang/Object;->hashCode()I"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
def test_double_dollar_class(self): def test_double_dollar_class(self):
elements = [ elements = [
"package:java", ("package", "java"),
"package:lang", ("package", "lang"),
"class:CharSequence", ("class", "CharSequence"),
"class:", ("class", ""),
"class:ExternalSyntheticLambda0", ("class", "ExternalSyntheticLambda0"),
"member:<init>(Ljava/lang/CharSequence;)V", ("member", "<init>(Ljava/lang/CharSequence;)V"),
] ]
signature = "Ljava/lang/CharSequence$$ExternalSyntheticLambda0;" \ signature = "Ljava/lang/CharSequence$$ExternalSyntheticLambda0;" \
"-><init>(Ljava/lang/CharSequence;)V" "-><init>(Ljava/lang/CharSequence;)V"
@@ -64,43 +64,43 @@ class TestSignatureToElements(unittest.TestCase):
def test_no_member(self): def test_no_member(self):
elements = [ elements = [
"package:java", ("package", "java"),
"package:lang", ("package", "lang"),
"class:CharSequence", ("class", "CharSequence"),
"class:", ("class", ""),
"class:ExternalSyntheticLambda0", ("class", "ExternalSyntheticLambda0"),
] ]
signature = "Ljava/lang/CharSequence$$ExternalSyntheticLambda0" signature = "Ljava/lang/CharSequence$$ExternalSyntheticLambda0"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
def test_wildcard(self): def test_wildcard(self):
elements = [ elements = [
"package:java", ("package", "java"),
"package:lang", ("package", "lang"),
"wildcard:*", ("wildcard", "*"),
] ]
signature = "java/lang/*" signature = "java/lang/*"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
def test_recursive_wildcard(self): def test_recursive_wildcard(self):
elements = [ elements = [
"package:java", ("package", "java"),
"package:lang", ("package", "lang"),
"wildcard:**", ("wildcard", "**"),
] ]
signature = "java/lang/**" signature = "java/lang/**"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
def test_no_packages_wildcard(self): def test_no_packages_wildcard(self):
elements = [ elements = [
"wildcard:*", ("wildcard", "*"),
] ]
signature = "*" signature = "*"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
def test_no_packages_recursive_wildcard(self): def test_no_packages_recursive_wildcard(self):
elements = [ elements = [
"wildcard:**", ("wildcard", "**"),
] ]
signature = "**" signature = "**"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))
@@ -115,9 +115,9 @@ class TestSignatureToElements(unittest.TestCase):
def test_non_standard_class_name(self): def test_non_standard_class_name(self):
elements = [ elements = [
"package:javax", ("package", "javax"),
"package:crypto", ("package", "crypto"),
"class:extObjectInputStream", ("class", "extObjectInputStream"),
] ]
signature = "Ljavax/crypto/extObjectInputStream" signature = "Ljavax/crypto/extObjectInputStream"
self.assertEqual(elements, self.signature_to_elements(signature)) self.assertEqual(elements, self.signature_to_elements(signature))