make tests pass new lint rules

diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml
index 3e5b239474977a06d27c6de340b7eb7720220811..ae82809d401a80ff7677ca4f1b88340be18ed983 100644 (file)
--- a/tests/metadata/dump/org.adaway.yaml
+++ b/tests/metadata/dump/org.adaway.yaml
@@ -40,7 +40,7 @@ Disabled: null
 Donate: http://sufficientlysecure.org/index.php/adaway
 FlattrID: '369138'
 IssueTracker: https://github.com/dschuermann/ad-away/issues
-License: GPLv3
+License: GPL-3.0
 Litecoin: null
 MaintainerNotes: ''
 Name: null

diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml
index 06b70b8d41fa7b6765ae8568c0e1bdad66b41a3f..ea608b97624d1c1181d3b46192cd3a8a85c826a8 100644 (file)
--- a/tests/metadata/dump/org.smssecure.smssecure.yaml
+++ b/tests/metadata/dump/org.smssecure.smssecure.yaml
@@ -37,7 +37,7 @@ Disabled: null
 Donate: null
 FlattrID: null
 IssueTracker: https://github.com/SMSSecure/SMSSecure/issues
-License: GPLv3
+License: GPL-3.0
 Litecoin: null
 MaintainerNotes: ''
 Name: null

diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml
index e173fcba6d1125a7451ed2777ed8afa4868b3ecc..dde25b36f18fe065ae025f3c15a4fedd834381cf 100644 (file)
--- a/tests/metadata/dump/org.videolan.vlc.yaml
+++ b/tests/metadata/dump/org.videolan.vlc.yaml
@@ -24,7 +24,7 @@ Disabled: null
 Donate: http://www.videolan.org/contribute.html#money
 FlattrID: null
 IssueTracker: http://www.videolan.org/support/index.html#bugs
-License: GPLv3
+License: GPL-3.0
 Litecoin: null
 MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
 

diff --git a/tests/metadata/info.guardianproject.checkey.txt b/tests/metadata/info.guardianproject.checkey.txt
index 43faaaded3d9d8d33c0d5e288202dddd762f5e18..eea6c7be8e601fcfc33a180022bd542cae83938a 100644 (file)
--- a/tests/metadata/info.guardianproject.checkey.txt
+++ b/tests/metadata/info.guardianproject.checkey.txt
@@ -1,5 +1,5 @@
 Categories:Development,GuardianProject
-License:GPLv3
+License:GPL-3.0
 Web Site:https://dev.guardianproject.info/projects/checkey
 Source Code:https://github.com/guardianproject/checkey
 Issue Tracker:https://dev.guardianproject.info/projects/checkey/issues

diff --git a/tests/metadata/info.guardianproject.urzip.yml b/tests/metadata/info.guardianproject.urzip.yml
index a1650816a68ea2679bfd4264135d9ecc7bb2521a..1406d43eabd081ec4aae83c1e12168c116ffe7b9 100644 (file)
--- a/tests/metadata/info.guardianproject.urzip.yml
+++ b/tests/metadata/info.guardianproject.urzip.yml
@@ -18,7 +18,7 @@ Description: |
   ★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact
 
 IssueTracker: https://dev.guardianproject.info/projects/urzip/issues
-License: GPLv3
+License: GPL-3.0
 Repo: https://github.com/guardianproject/urzip.git
 RepoType: git
 SourceCode: https://github.com/guardianproject/urzip

diff --git a/tests/metadata/obb.main.oldversion.txt b/tests/metadata/obb.main.oldversion.txt
index 56c4a9f57e9e3230634af716a0b7fef2983e7504..943f0c15f243db5139a56ed328f8cc1c4174ef69 100644 (file)
--- a/tests/metadata/obb.main.oldversion.txt
+++ b/tests/metadata/obb.main.oldversion.txt
@@ -1,5 +1,5 @@
 Categories:Development
-License:GPLv3
+License:GPL-3.0
 Source Code:https://github.com/eighthave/urzip
 Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 

diff --git a/tests/metadata/obb.main.twoversions.txt b/tests/metadata/obb.main.twoversions.txt
index d06afa36f635e446d9d03db39e5eccd4be460bc5..d358da88da543dde8efc8d46715afb2b30453309 100644 (file)
--- a/tests/metadata/obb.main.twoversions.txt
+++ b/tests/metadata/obb.main.twoversions.txt
@@ -1,5 +1,5 @@
 Categories:Development
-License:GPLv3
+License:GPL-3.0
 Source Code:https://github.com/eighthave/urzip
 Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 

diff --git a/tests/metadata/obb.mainpatch.current.txt b/tests/metadata/obb.mainpatch.current.txt
index 2f7571f51b407004f90d42ac6cf684b0141a22e6..2007a69e8de1b42bce5887027f52ab464acedf14 100644 (file)
--- a/tests/metadata/obb.mainpatch.current.txt
+++ b/tests/metadata/obb.mainpatch.current.txt
@@ -1,5 +1,5 @@
 Categories:Development
-License:GPLv3
+License:GPL-3.0
 Source Code:https://github.com/eighthave/urzip
 Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 

diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json
index c95a88781da064a11b34e1d15920ddd7102b3e6c..dda8ae600321ad96227da64964248d9851571e1a 100644 (file)
--- a/tests/metadata/org.adaway.json
+++ b/tests/metadata/org.adaway.json
@@ -22,7 +22,7 @@
     "Donate": "http://sufficientlysecure.org/index.php/adaway",
     "FlattrID": "369138",
     "IssueTracker": "https://github.com/dschuermann/ad-away/issues",
-    "License": "GPLv3",
+    "License": "GPL-3.0",
     "Provides": "org.sufficientlysecure.adaway",
     "Repo": "https://github.com/dschuermann/ad-away.git",
     "RepoType": "git",

diff --git a/tests/metadata/org.smssecure.smssecure.txt b/tests/metadata/org.smssecure.smssecure.txt
index d4ff2384b6335875f529cb10a6735e05b2ba948a..655857effb93b4f9941252fe911db65c762699eb 100644 (file)
--- a/tests/metadata/org.smssecure.smssecure.txt
+++ b/tests/metadata/org.smssecure.smssecure.txt
@@ -1,5 +1,5 @@
 Categories:Phone & SMS
-License:GPLv3
+License:GPL-3.0
 Web Site:http://www.smssecure.org
 Source Code:https://github.com/SMSSecure/SMSSecure
 Issue Tracker:https://github.com/SMSSecure/SMSSecure/issues

diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml
index 7d38ecce73ff95428b5a177db499399d7b385c89..33c46f13ba46ffa1dc1766cc0a75ba838472ba03 100644 (file)
--- a/tests/metadata/org.videolan.vlc.yml
+++ b/tests/metadata/org.videolan.vlc.yml
@@ -1,6 +1,6 @@
 Categories:
   - Multimedia
-License: GPLv3
+License: GPL-3.0
 WebSite: http://www.videolan.org/vlc/download-android.html
 SourceCode: http://git.videolan.org/?p=vlc-ports/android.git;a=summary
 IssueTracker: "http://www.videolan.org/support/index.html#bugs"

diff --git a/tests/repo/index.xml b/tests/repo/index.xml
index 052381a22e35f9d16cef1f81efaa9b39a65ad59b..88507d52ffe801bef04e3c1dacc11c83676679dc 100644 (file)
--- a/tests/repo/index.xml
+++ b/tests/repo/index.xml
@@ -41,7 +41,7 @@
                <summary></summary>
                <icon>obb.main.oldversion.1444412523.png</icon>
                <desc>&lt;p&gt;No description available&lt;/p&gt;</desc>
-               <license>GPLv3</license>
+               <license>GPL-3.0</license>
                <categories>Development</categories>
                <category>Development</category>
                <web></web>
@@ -76,7 +76,7 @@
                <summary></summary>
                <icon>obb.main.twoversions.1101617.png</icon>
                <desc>&lt;p&gt;No description available&lt;/p&gt;</desc>
-               <license>GPLv3</license>
+               <license>GPL-3.0</license>
                <categories>Development</categories>
                <category>Development</category>
                <web></web>
@@ -134,7 +134,7 @@
                <summary></summary>
                <icon>obb.mainpatch.current.1619.png</icon>
                <desc>&lt;p&gt;No description available&lt;/p&gt;</desc>
-               <license>GPLv3</license>
+               <license>GPL-3.0</license>
                <categories>Development</categories>
                <category>Development</category>
                <web></web>
@@ -167,7 +167,7 @@
                <summary>一个实用工具，获取已安装在您的设备上的应用的有关信息</summary>
                <icon>info.guardianproject.urzip.100.png</icon>
                <desc>&lt;p&gt;It’s Urzip 是一个获得已安装 APK 相关信息的实用工具。它从您的设备上已安装的所有应用开始，一键触摸即可显示 APK 的指纹，并且提供到达 virustotal.com 和 androidobservatory.org 的快捷链接，让您方便地了解特定 APK 的档案。它还可以让您导出签名证书和生成 ApkSignaturePin Pin 文件供 TrustedIntents 库使用。&lt;/p&gt;&lt;p&gt;★ Urzip 支持下列语言： Deutsch, English, español, suomi, 日本語, 한국어, Norsk, português (Portugal), Русский, Slovenščina, Türkçe 没看到您的语言？帮忙翻译本应用吧： https://www.transifex.com/projects/p/urzip&lt;/p&gt;&lt;p&gt;★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact&lt;/p&gt;</desc>
-               <license>GPLv3</license>
+               <license>GPL-3.0</license>
                <categories>Development,GuardianProject,1,2.0</categories>
                <category>Development</category>
                <web>https://dev.guardianproject.info/projects/urzip</web>

diff --git a/tests/run-tests b/tests/run-tests
index 563145a5b9076f33d45d7917bbd68cf058039fa8..f640322ec8bebf727cfa88cf3d82d026205f1b51 100755 (executable)
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -262,7 +262,7 @@ REPOROOT=`create_test_dir`
 cd $REPOROOT
 mkdir repo
 mkdir metadata
-echo "License:GPL" >> metadata/fake.txt
+echo "License:GPL-2.0" >> metadata/fake.txt
 echo "Summary:Yup still fake" >> metadata/fake.txt
 echo "Categories:Internet" >> metadata/fake.txt
 echo "Description:" >> metadata/fake.txt