From 7b59e7b2d038a50573155c2d51dd086f744eb26a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 10 Sep 2018 13:35:13 -0700 Subject: Make manifest_fixer.py keep targetSdkVersion high with min_sdk_version targetSdkVersion should stay as "current" when min_sdk_version is set but sdk_version is not. Bug: 112438448 Test: atest CtsTelecomTestCases Change-Id: I11dc27eccd31200d1ce27c7e332106bb825651b4 --- scripts/manifest_fixer_test.py | 47 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'scripts/manifest_fixer_test.py') diff --git a/scripts/manifest_fixer_test.py b/scripts/manifest_fixer_test.py index 99e8b0379..66a2317f5 100755 --- a/scripts/manifest_fixer_test.py +++ b/scripts/manifest_fixer_test.py @@ -55,9 +55,10 @@ class RaiseMinSdkVersionTest(unittest.TestCase): """Unit tests for raise_min_sdk_version function.""" def raise_min_sdk_version_test(self, input_manifest, min_sdk_version, - library): + target_sdk_version, library): doc = minidom.parseString(input_manifest) - manifest_fixer.raise_min_sdk_version(doc, min_sdk_version, library) + manifest_fixer.raise_min_sdk_version(doc, min_sdk_version, + target_sdk_version, library) output = StringIO.StringIO() manifest_fixer.write_xml(output, doc) return output.getvalue() @@ -84,7 +85,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % '' expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '28', False) self.assertEqual(output, expected) def test_no_min(self): @@ -93,7 +94,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % ' \n' expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28', extra='extra="foo"') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '28', False) self.assertEqual(output, expected) def test_raise_min(self): @@ -101,7 +102,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='27') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '28', False) self.assertEqual(output, expected) def test_raise(self): @@ -109,7 +110,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='27') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '28', False) self.assertEqual(output, expected) def test_no_raise_min(self): @@ -117,7 +118,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='28') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27') - output = self.raise_min_sdk_version_test(manifest_input, '27', False) + output = self.raise_min_sdk_version_test(manifest_input, '27', '27', False) self.assertEqual(output, expected) def test_raise_codename(self): @@ -125,7 +126,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='28') expected = self.manifest_tmpl % self.uses_sdk(min='P', target='P') - output = self.raise_min_sdk_version_test(manifest_input, 'P', False) + output = self.raise_min_sdk_version_test(manifest_input, 'P', 'P', False) self.assertEqual(output, expected) def test_no_raise_codename(self): @@ -133,7 +134,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='P') expected = self.manifest_tmpl % self.uses_sdk(min='P', target='28') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '28', False) self.assertEqual(output, expected) def test_target(self): @@ -141,31 +142,31 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='26', target='27') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', False) self.assertEqual(output, expected) def test_no_target(self): """Tests inserting targetSdkVersion when minSdkVersion exists.""" manifest_input = self.manifest_tmpl % self.uses_sdk(min='27') - expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + expected = self.manifest_tmpl % self.uses_sdk(min='28', target='29') + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', False) self.assertEqual(output, expected) def test_target_no_min(self): - """Tests inserting targetSdkVersion when minSdkVersion exists.""" + """"Tests inserting targetSdkVersion when minSdkVersion exists.""" manifest_input = self.manifest_tmpl % self.uses_sdk(target='27') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', False) self.assertEqual(output, expected) def test_no_target_no_min(self): """Tests inserting targetSdkVersion when minSdkVersion does not exist.""" manifest_input = self.manifest_tmpl % '' - expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + expected = self.manifest_tmpl % self.uses_sdk(min='28', target='29') + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', False) self.assertEqual(output, expected) def test_library_no_target(self): @@ -173,7 +174,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(min='27') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='1') - output = self.raise_min_sdk_version_test(manifest_input, '28', True) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', True) self.assertEqual(output, expected) def test_library_target_no_min(self): @@ -181,7 +182,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.uses_sdk(target='27') expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27') - output = self.raise_min_sdk_version_test(manifest_input, '28', True) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', True) self.assertEqual(output, expected) def test_library_no_target_no_min(self): @@ -189,7 +190,7 @@ class RaiseMinSdkVersionTest(unittest.TestCase): manifest_input = self.manifest_tmpl % '' expected = self.manifest_tmpl % self.uses_sdk(min='28', target='1') - output = self.raise_min_sdk_version_test(manifest_input, '28', True) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', True) self.assertEqual(output, expected) def test_extra(self): @@ -203,10 +204,10 @@ class RaiseMinSdkVersionTest(unittest.TestCase): # pylint: disable=line-too-long expected = self.manifest_tmpl % ( ' \n' - ' \n' + ' \n' ' \n') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', False) self.assertEqual(output, expected) @@ -217,10 +218,10 @@ class RaiseMinSdkVersionTest(unittest.TestCase): # pylint: disable=line-too-long expected = self.manifest_tmpl % ( - ' \n' + ' \n' ' \n') - output = self.raise_min_sdk_version_test(manifest_input, '28', False) + output = self.raise_min_sdk_version_test(manifest_input, '28', '29', False) self.assertEqual(output, expected) -- cgit v1.2.3-59-g8ed1b