From e33c1c74b1ff08fae25f86dae4e1d96f2a1bceb2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 10 Oct 2018 12:16:43 +0200 Subject: [PATCH] tests: include info.zwanenburg.caffeinetile in index tests --- .../metadata/info.zwanenburg.caffeinetile.yml | 4 ++ tests/repo/categories.txt | 2 +- tests/repo/index-v1.json | 37 ++++++++++++++++++- tests/repo/index.xml | 29 +++++++++++++++ tests/stats/known_apks.txt | 1 + tests/update.TestCase | 6 +-- 6 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 tests/metadata/info.zwanenburg.caffeinetile.yml diff --git a/tests/metadata/info.zwanenburg.caffeinetile.yml b/tests/metadata/info.zwanenburg.caffeinetile.yml new file mode 100644 index 00000000..a1c0b284 --- /dev/null +++ b/tests/metadata/info.zwanenburg.caffeinetile.yml @@ -0,0 +1,4 @@ +Categories: +- Development +Name: Caffeine Tile +Summary: Test app for extracting icons when an XML one is default diff --git a/tests/repo/categories.txt b/tests/repo/categories.txt index d4a50083..9af231f5 100644 --- a/tests/repo/categories.txt +++ b/tests/repo/categories.txt @@ -3,8 +3,8 @@ Development GuardianProject Multimedia -None Phone & SMS Security System Time +tests diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json index d0b41ec4..5063697c 100644 --- a/tests/repo/index-v1.json +++ b/tests/repo/index-v1.json @@ -41,6 +41,19 @@ "packageName": "souch.smsbypass", "lastUpdated": 1524700800000 }, + { + "categories": [ + "Development" + ], + "suggestedVersionCode": "4", + "license": "Unknown", + "name": "Caffeine Tile", + "summary": "Test app for extracting icons when an XML one is default", + "added": 1539129600000, + "icon": "info.zwanenburg.caffeinetile.4.xml", + "packageName": "info.zwanenburg.caffeinetile", + "lastUpdated": 1539129600000 + }, { "categories": [ "tests" @@ -411,6 +424,28 @@ "versionName": "0.1" } ], + "info.zwanenburg.caffeinetile": [ + { + "added": 1539129600000, + "apkName": "info.zwanenburg.caffeinetile_4.apk", + "hash": "dbbdd7deadb038862f426b71efe4a64df8c3edf25d669e935f349510e16f65db", + "hashType": "sha256", + "minSdkVersion": "24", + "packageName": "info.zwanenburg.caffeinetile", + "sig": "03f9b2f848d22fd1d8d1331e8b1b486d", + "signer": "51cfa5c8a743833ad89acf81cb755936876a5c8b8eca54d1ffdcec0cdca25d0e", + "size": 11740, + "targetSdkVersion": "25", + "uses-permission": [ + [ + "android.permission.WAKE_LOCK", + null + ] + ], + "versionCode": 4, + "versionName": "1.3" + } + ], "no.min.target.sdk": [ { "added": 1539129600000, @@ -642,4 +677,4 @@ } ] } -} +} \ No newline at end of file diff --git a/tests/repo/index.xml b/tests/repo/index.xml index b82fd661..313e8876 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -39,6 +39,35 @@ READ_CONTACTS,READ_EXTERNAL_STORAGE,RECEIVE_SMS,SEND_SMS,VIBRATE,WRITE_EXTERNAL_STORAGE + + info.zwanenburg.caffeinetile + 2018-10-10 + 2018-10-10 + Caffeine Tile + Test app for extracting icons when an XML one is default + info.zwanenburg.caffeinetile.4.xml + <p>No description available</p> + Unknown + Development + Development + + + + + 4 + + 1.3 + 4 + info.zwanenburg.caffeinetile_4.apk + dbbdd7deadb038862f426b71efe4a64df8c3edf25d669e935f349510e16f65db + 11740 + 24 + 25 + 2018-10-10 + 03f9b2f848d22fd1d8d1331e8b1b486d + WAKE_LOCK + + duplicate.permisssions 2017-12-22 diff --git a/tests/stats/known_apks.txt b/tests/stats/known_apks.txt index 0fa1f1b6..d25073a0 100644 --- a/tests/stats/known_apks.txt +++ b/tests/stats/known_apks.txt @@ -4,6 +4,7 @@ com.politedroid_5.apk com.politedroid 2017-06-23 com.politedroid_6.apk com.politedroid 2017-06-23 duplicate.permisssions_9999999.apk duplicate.permisssions 2017-12-22 fake.ota.update_1234.zip fake.ota.update 2016-03-10 +info.zwanenburg.caffeinetile_4.apk info.zwanenburg.caffeinetile 2018-10-10 no.min.target.sdk_987.apk no.min.target.sdk 2018-10-10 obb.main.oldversion_1444412523.apk obb.main.oldversion 2013-12-31 obb.main.twoversions_1101613.apk obb.main.twoversions 2015-10-12 diff --git a/tests/update.TestCase b/tests/update.TestCase index 84600bfe..e56f91e0 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -254,7 +254,7 @@ class UpdateTest(unittest.TestCase): apps = fdroidserver.metadata.read_metadata(xref=True) knownapks = fdroidserver.common.KnownApks() apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False) - self.assertEqual(len(apks), 14) + self.assertEqual(len(apks), 15) apk = apks[0] self.assertEqual(apk['packageName'], 'com.politedroid') self.assertEqual(apk['versionCode'], 3) @@ -321,7 +321,7 @@ class UpdateTest(unittest.TestCase): fdroidserver.update.options.clean = False read_from_json = fdroidserver.update.get_cache() - self.assertEqual(16, len(read_from_json)) + self.assertEqual(17, len(read_from_json)) for f in glob.glob('repo/*.apk'): self.assertTrue(os.path.basename(f) in read_from_json) @@ -623,7 +623,7 @@ class UpdateTest(unittest.TestCase): knownapks = fdroidserver.common.KnownApks() apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False) fdroidserver.update.translate_per_build_anti_features(apps, apks) - self.assertEqual(len(apks), 14) + self.assertEqual(len(apks), 15) foundtest = False for apk in apks: if apk['packageName'] == 'com.politedroid' and apk['versionCode'] == 3: