Merge branch 'fixFlavor' into 'master'

[fdroidserver.git] / tests / common.TestCase

diff --git a/tests/common.TestCase b/tests/common.TestCase
index a6cc9d87827ec51376e4c40550467a8a13e6ac90..35bc01e1e253e0a645efca35dd98d43f4e7ea0ff 100755 (executable)
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -627,6 +627,7 @@ class CommonTest(unittest.TestCase):
 
     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']
@@ -641,6 +642,19 @@ class CommonTest(unittest.TestCase):
         self.assertEqual(('0.95-dev', '949', 'org.fdroid.fdroid.dev'),
                          fdroidserver.common.parse_androidmanifests(paths, app))
 
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['free']
+        app.builds = [build]
+        app.id = 'eu.siacs.conversations'
+        paths = [
+            os.path.join(source_files_dir, 'eu.siacs.conversations', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('1.23.1', '245', 'eu.siacs.conversations'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
 
 if __name__ == "__main__":
     parser = optparse.OptionParser()