From 5dcc879bfb101eaeca107392c62b3d1cac1af889 Mon Sep 17 00:00:00 2001 From: Andre Miras Date: Sat, 30 May 2020 00:47:18 +0200 Subject: [PATCH] :white_check_mark: Tests android.numeric_version config Follow-up for #1126 --- tests/targets/test_android.py | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tests/targets/test_android.py b/tests/targets/test_android.py index cc4d0097d..03d3c25b1 100644 --- a/tests/targets/test_android.py +++ b/tests/targets/test_android.py @@ -1,4 +1,5 @@ import os +import re import tempfile from unittest import mock @@ -93,11 +94,8 @@ def init_target(self, options=None): spec = [] for line in default_spec: if line.strip(): - key = line.split()[0] - - if key.startswith('#'): - key = key[1:] - + match = re.search(r'[#\s]?([a-z_\.]+)', line) + key = match and match.group(1) if key in options: line = '{} = {}\n'.format(key, options[key]) @@ -288,6 +286,31 @@ def test_build_package(self): ) ] + def test_numeric_version(self): + """The `android.numeric_version` config should be passed to `build_package()`.""" + self.init_target({ + "android.numeric_version": "1234" + }) + m_execute_build_package = self.call_build_package() + assert m_execute_build_package.call_args_list == [ + mock.call( + [ + ("--name", "'My Application'"), + ("--version", "0.1"), + ("--package", "org.test.myapp"), + ("--minsdk", "21"), + ("--ndk-api", "21"), + ("--private", "{buildozer_dir}/android/app".format(buildozer_dir=self.buildozer.buildozer_dir)), + ("--android-entrypoint", "org.kivy.android.PythonActivity"), + ("--android-apptheme", "@android:style/Theme.NoTitleBar"), + ("--orientation", "portrait"), + ("--window",), + ("--numeric-version", "1234"), + ("debug",), + ] + ) + ] + def test_build_package_intent_filters(self): """ The build_package() method should honour the manifest.intent_filters