mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
added test case
This commit is contained in:
parent
f8492f05a8
commit
33aee96ed9
@ -1299,6 +1299,8 @@ def parse_androidmanifests(paths, app):
|
||||
vercode = None
|
||||
package = None
|
||||
|
||||
flavour = ""
|
||||
if app.builds and 'gradle' in app.builds[-1] and app.builds[-1].gradle:
|
||||
flavour = app.builds[-1].gradle[-1]
|
||||
|
||||
if has_extension(path, 'gradle'):
|
||||
|
@ -492,6 +492,35 @@ class CommonTest(unittest.TestCase):
|
||||
self.assertEqual('b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868', sig)
|
||||
|
||||
|
||||
def test_parse_androidmanifests(self):
|
||||
source_files_dir = os.path.join(os.path.dirname(__file__), 'source-files')
|
||||
app = fdroidserver.metadata.App()
|
||||
app.id = 'org.fdroid.fdroid'
|
||||
paths = [
|
||||
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
|
||||
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'build.gradle'),
|
||||
]
|
||||
for path in paths:
|
||||
self.assertTrue(os.path.isfile(path))
|
||||
self.assertEqual(('0.94-test', '940', 'org.fdroid.fdroid'),
|
||||
fdroidserver.common.parse_androidmanifests(paths, app))
|
||||
|
||||
def test_parse_androidmanifests_with_flavor(self):
|
||||
source_files_dir = os.path.join(os.path.dirname(__file__), 'source-files')
|
||||
app = fdroidserver.metadata.App()
|
||||
build = fdroidserver.metadata.Build()
|
||||
build.gradle = ['devVersion']
|
||||
app.builds = [build]
|
||||
app.id = 'org.fdroid.fdroid.dev'
|
||||
paths = [
|
||||
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
|
||||
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'build.gradle'),
|
||||
]
|
||||
for path in paths:
|
||||
self.assertTrue(os.path.isfile(path))
|
||||
self.assertEqual(('0.95-dev', '949', 'org.fdroid.fdroid.dev'),
|
||||
fdroidserver.common.parse_androidmanifests(paths, app))
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option("-v", "--verbose", action="store_true", default=False,
|
||||
|
@ -129,6 +129,21 @@ android {
|
||||
compileSdkVersion 21
|
||||
buildToolsVersion '22.0.1'
|
||||
|
||||
defaultConfig {
|
||||
|
||||
flavorDimensions "default"
|
||||
|
||||
productFlavors {
|
||||
devVersion {
|
||||
applicationId "org.fdroid.fdroid.dev"
|
||||
dimension "default"
|
||||
versionCode 949
|
||||
versionName "0.95-dev"
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
manifest.srcFile 'AndroidManifest.xml'
|
||||
|
Loading…
Reference in New Issue
Block a user