Fix manifest_fixer_test.py
Fix tests after I8fcf0c5f452707565ba1808f6fe552ffed055c47.
Test: manifest_fixer_test.py
Change-Id: Ie55e28b537b960a5e0f4785eda2c0f619b89275c
diff --git a/scripts/manifest_fixer_test.py b/scripts/manifest_fixer_test.py
index ac72e6d..99e8b03 100755
--- a/scripts/manifest_fixer_test.py
+++ b/scripts/manifest_fixer_test.py
@@ -54,7 +54,8 @@
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):
+ def raise_min_sdk_version_test(self, input_manifest, min_sdk_version,
+ library):
doc = minidom.parseString(input_manifest)
manifest_fixer.raise_min_sdk_version(doc, min_sdk_version, library)
output = StringIO.StringIO()
@@ -69,13 +70,13 @@
# pylint: disable=redefined-builtin
def uses_sdk(self, min=None, target=None, extra=''):
- attrs = ""
+ attrs = ''
if min:
attrs += ' android:minSdkVersion="%s"' % (min)
if target:
attrs += ' android:targetSdkVersion="%s"' % (target)
if extra:
- attrs += ' ' + extra
+ attrs += ' ' + extra
return ' <uses-sdk%s/>\n' % (attrs)
def test_no_uses_sdk(self):
@@ -99,7 +100,7 @@
"""Tests inserting a minSdkVersion attribute into a uses-sdk element."""
manifest_input = self.manifest_tmpl % self.uses_sdk(min='27')
- expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27')
+ expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28')
output = self.raise_min_sdk_version_test(manifest_input, '28', False)
self.assertEqual(output, expected)
@@ -107,7 +108,7 @@
"""Tests raising a minSdkVersion attribute."""
manifest_input = self.manifest_tmpl % self.uses_sdk(min='27')
- expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27')
+ expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28')
output = self.raise_min_sdk_version_test(manifest_input, '28', False)
self.assertEqual(output, expected)
@@ -115,7 +116,7 @@
"""Tests a minSdkVersion that doesn't need raising."""
manifest_input = self.manifest_tmpl % self.uses_sdk(min='28')
- expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28')
+ expected = self.manifest_tmpl % self.uses_sdk(min='28', target='27')
output = self.raise_min_sdk_version_test(manifest_input, '27', False)
self.assertEqual(output, expected)
@@ -123,7 +124,7 @@
"""Tests raising a minSdkVersion attribute to a codename."""
manifest_input = self.manifest_tmpl % self.uses_sdk(min='28')
- expected = self.manifest_tmpl % self.uses_sdk(min='P', target='28')
+ expected = self.manifest_tmpl % self.uses_sdk(min='P', target='P')
output = self.raise_min_sdk_version_test(manifest_input, 'P', False)
self.assertEqual(output, expected)
@@ -131,7 +132,7 @@
"""Tests a minSdkVersion codename that doesn't need raising."""
manifest_input = self.manifest_tmpl % self.uses_sdk(min='P')
- expected = self.manifest_tmpl % self.uses_sdk(min='P', target='P')
+ expected = self.manifest_tmpl % self.uses_sdk(min='P', target='28')
output = self.raise_min_sdk_version_test(manifest_input, '28', False)
self.assertEqual(output, expected)
@@ -147,17 +148,17 @@
"""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='27')
+ expected = self.manifest_tmpl % self.uses_sdk(min='28', target='28')
output = self.raise_min_sdk_version_test(manifest_input, '28', 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)
- self.assertEqual(output, expected)
+ 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)
+ self.assertEqual(output, expected)
def test_no_target_no_min(self):
"""Tests inserting targetSdkVersion when minSdkVersion does not exist."""
@@ -168,28 +169,28 @@
self.assertEqual(output, expected)
def test_library_no_target(self):
- """Tests inserting targetSdkVersion when minSdkVersion exists."""
+ """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='27')
- output = self.raise_min_sdk_version_test(manifest_input, '28', True)
- self.assertEqual(output, expected)
+ 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)
+ self.assertEqual(output, expected)
def test_library_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', True)
- self.assertEqual(output, expected)
+ 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)
+ self.assertEqual(output, expected)
def test_library_no_target_no_min(self):
- """Tests inserting targetSdkVersion when minSdkVersion does not exist."""
+ """Tests inserting targetSdkVersion when minSdkVersion does not exist."""
- 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)
- self.assertEqual(output, expected)
+ 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)
+ self.assertEqual(output, expected)
def test_extra(self):
"""Tests that extra attributes and elements are maintained."""
@@ -202,7 +203,7 @@
# pylint: disable=line-too-long
expected = self.manifest_tmpl % (
' <!-- comment -->\n'
- ' <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="27" extra="foo"/>\n'
+ ' <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" extra="foo"/>\n'
' <application/>\n')
output = self.raise_min_sdk_version_test(manifest_input, '28', False)