diff options
Diffstat (limited to 'scripts/construct_context_test.py')
| -rwxr-xr-x | scripts/construct_context_test.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/scripts/construct_context_test.py b/scripts/construct_context_test.py index 0b0b0a315..3b05f9013 100755 --- a/scripts/construct_context_test.py +++ b/scripts/construct_context_test.py @@ -27,53 +27,47 @@ def construct_contexts(arglist): args = cc.parse_args(arglist) return cc.construct_contexts(args) -classpaths = [ - '--host-classpath-for-sdk', '28', 'out/zdir/z.jar', - '--target-classpath-for-sdk', '28', '/system/z.jar', - '--host-classpath-for-sdk', '29', 'out/xdir/x.jar:out/ydir/y.jar', - '--target-classpath-for-sdk', '29', '/system/x.jar:/product/y.jar', - '--host-classpath-for-sdk', 'any', 'out/adir/a.jar:out/android.hidl.manager-V1.0-java.jar:out/bdir/b.jar', - '--target-classpath-for-sdk', 'any', '/system/a.jar:/system/android.hidl.manager-V1.0-java.jar:/product/b.jar', +contexts = [ + '--host-context-for-sdk', '28', 'PCL[out/zdir/z.jar]', + '--target-context-for-sdk', '28', 'PCL[/system/z.jar]', + '--host-context-for-sdk', '29', 'PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]', + '--target-context-for-sdk', '29', 'PCL[/system/x.jar]#PCL[/product/y.jar]', + '--host-context-for-sdk', 'any', 'PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]', + '--target-context-for-sdk', 'any', 'PCL[/system/a.jar]#PCL[/product/b.jar]', ] class ConstructContextTest(unittest.TestCase): def test_construct_context_28(self): - args = ['--target-sdk-version', '28'] + classpaths + args = ['--target-sdk-version', '28'] + contexts result = construct_contexts(args) expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]' '#PCL[out/ydir/y.jar]' '#PCL[out/adir/a.jar]' - '#PCL[out/android.hidl.manager-V1.0-java.jar]{PCL[out/android.hidl.base-V1.0-java.jar]}' '#PCL[out/bdir/b.jar]}' ' ; ' 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]' '#PCL[/product/y.jar]' '#PCL[/system/a.jar]' - '#PCL[/system/android.hidl.manager-V1.0-java.jar]{PCL[/system/android.hidl.base-V1.0-java.jar]}' '#PCL[/product/b.jar]}') self.assertEqual(result, expect) def test_construct_context_29(self): - args = ['--target-sdk-version', '29'] + classpaths + args = ['--target-sdk-version', '29'] + contexts result = construct_contexts(args) expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' - '#PCL[out/android.hidl.manager-V1.0-java.jar]{PCL[out/android.hidl.base-V1.0-java.jar]}' '#PCL[out/bdir/b.jar]}' ' ; ' 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' - '#PCL[/system/android.hidl.manager-V1.0-java.jar]{PCL[/system/android.hidl.base-V1.0-java.jar]}' '#PCL[/product/b.jar]}') self.assertEqual(result, expect) def test_construct_context_S(self): - args = ['--target-sdk-version', 'S'] + classpaths + args = ['--target-sdk-version', 'S'] + contexts result = construct_contexts(args) expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' - '#PCL[out/android.hidl.manager-V1.0-java.jar]{PCL[out/android.hidl.base-V1.0-java.jar]}' '#PCL[out/bdir/b.jar]}' ' ; ' 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' - '#PCL[/system/android.hidl.manager-V1.0-java.jar]{PCL[/system/android.hidl.base-V1.0-java.jar]}' '#PCL[/product/b.jar]}') self.assertEqual(result, expect) |