refactored yaml tests into metadata test case; fixed typo

diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase
index 791ac65256b5d5a193b1722909f9bf08b189fe7d..712d16f7b499286868cb72cefa7b90688f4cd828 100755 (executable)
--- a/tests/metadata.TestCase
+++ b/tests/metadata.TestCase
@@ -8,6 +8,7 @@ import os
 import sys
 import unittest
 import yaml
+import tempfile
 
 localmodule = os.path.realpath(
     os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
@@ -54,6 +55,69 @@ class MetadataTest(unittest.TestCase):
             #     yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer)
             #     yaml.dump(frommeta, f, default_flow_style=False)
 
+    def test_rewrite_yaml_fakeotaupdate(self):
+
+        # setup/reset test dir if necessary and setup params
+        tmpdir = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
+        if not os.path.exists(tmpdir):
+            os.makedirs(tmpdir)
+        testdir = tempfile.mkdtemp(prefix='test_rewrite_metadata_', dir=tmpdir)
+        fdroidserver.common.config = {'accepted_formats': ['txt', 'yml']}
+
+        # rewrite metadata
+        allapps = fdroidserver.metadata.read_metadata(xref=True)
+        for appid, app in allapps.items():
+            if appid == 'fake.ota.update':
+                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
+
+        # assert rewrite result
+        with open(os.path.join(testdir, 'fake.ota.update.yml'), 'r', encoding='utf-8') as result:
+            with open('metadata/rewrite-yml/fake.ota.update.yml', 'r', encoding='utf-8') as orig:
+                self.maxDiff = None
+                self.assertEqual(result.read(), orig.read())
+
+    def test_rewrite_yaml_fdroidclient(self):
+
+        # setup/reset test dir if necessary and setup params
+        tmpdir = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
+        if not os.path.exists(tmpdir):
+            os.makedirs(tmpdir)
+        testdir = tempfile.mkdtemp(prefix='test_rewrite_metadata_', dir=tmpdir)
+        fdroidserver.common.config = {'accepted_formats': ['txt', 'yml']}
+
+        # rewrite metadata
+        allapps = fdroidserver.metadata.read_metadata(xref=True)
+        for appid, app in allapps.items():
+            if appid == 'org.fdroid.fdroid':
+                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
+
+        # assert rewrite result
+        with open(os.path.join(testdir, 'org.fdroid.fdroid.yml'), 'r', encoding='utf-8') as result:
+            with open('metadata/rewrite-yml/org.fdroid.fdroid.yml', 'r', encoding='utf-8') as orig:
+                self.maxDiff = None
+                self.assertEqual(result.read(), orig.read())
+
+    def test_rewrite_yaml_special_build_params(self):
+
+        # setup/reset test dir if necessary and setup params
+        tmpdir = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
+        if not os.path.exists(tmpdir):
+            os.makedirs(tmpdir)
+        testdir = tempfile.mkdtemp(prefix='test_rewrite_metadata_', dir=tmpdir)
+        fdroidserver.common.config = {'accepted_formats': ['txt', 'yml']}
+
+        # rewrite metadata
+        allapps = fdroidserver.metadata.read_metadata(xref=True)
+        for appid, app in allapps.items():
+            if appid == 'app.with.special.build.params':
+                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
+
+        # assert rewrite result
+        with open(os.path.join(testdir, 'app.with.special.build.params.yml'), 'r', encoding='utf-8') as result:
+            with open('metadata/rewrite-yml/app.with.special.build.params.yml', 'r', encoding='utf-8') as orig:
+                self.maxDiff = None
+                self.assertEqual(result.read(), orig.read())
+
 
 if __name__ == "__main__":
     parser = optparse.OptionParser()

diff --git a/tests/metadata/app.with.speacial.build.params.txt b/tests/metadata/app.with.special.build.params.txt
similarity index 100%
rename from tests/metadata/app.with.speacial.build.params.txt
rename to tests/metadata/app.with.special.build.params.txt

diff --git a/tests/metadata/rewrite-yml/app.with.speacial.build.params.yml b/tests/metadata/rewrite-yml/app.with.special.build.params.yml
similarity index 100%
rename from tests/metadata/rewrite-yml/app.with.speacial.build.params.yml
rename to tests/metadata/rewrite-yml/app.with.special.build.params.yml

diff --git a/tests/rewritemeta.TestCase b/tests/rewritemeta.TestCase
deleted file mode 100755 (executable)
index 1801ebc..0000000
--- a/tests/rewritemeta.TestCase
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env python3
-
-import inspect
-import optparse
-import os
-import sys
-import unittest
-import tempfile
-
-localmodule = os.path.realpath(
-    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
-if localmodule not in sys.path:
-    sys.path.insert(0, localmodule)
-
-import fdroidserver.common
-import fdroidserver.metadata
-
-
-class RewritemetaTest(unittest.TestCase):
-    '''    fdroidserver/metadata.py'''
-
-    def test_rewrite_yaml_fakeotaupdate(self):
-
-        # setup/reset test dir if necessary and setup params
-        tmpdir = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
-        if not os.path.exists(tmpdir):
-            os.makedirs(tmpdir)
-        testdir = tempfile.mkdtemp(prefix='test_rewrite_metadata_', dir=tmpdir)
-        fdroidserver.common.config = {'accepted_formats': ['txt', 'yml']}
-
-        # rewrite metadata
-        allapps = fdroidserver.metadata.read_metadata(xref=True)
-        for appid, app in allapps.items():
-            if appid == 'fake.ota.update':
-                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
-
-        # assert rewrite result
-        with open(os.path.join(testdir, 'fake.ota.update.yml'), 'r', encoding='utf-8') as result:
-            with open('metadata/rewrite-yml/fake.ota.update.yml', 'r', encoding='utf-8') as orig:
-                self.maxDiff = None
-                self.assertEqual(result.read(), orig.read())
-
-    def test_rewrite_yaml_fdroidclient(self):
-
-        # setup/reset test dir if necessary and setup params
-        tmpdir = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
-        if not os.path.exists(tmpdir):
-            os.makedirs(tmpdir)
-        testdir = tempfile.mkdtemp(prefix='test_rewrite_metadata_', dir=tmpdir)
-        fdroidserver.common.config = {'accepted_formats': ['txt', 'yml']}
-
-        # rewrite metadata
-        allapps = fdroidserver.metadata.read_metadata(xref=True)
-        for appid, app in allapps.items():
-            if appid == 'org.fdroid.fdroid':
-                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
-
-        # assert rewrite result
-        with open(os.path.join(testdir, 'org.fdroid.fdroid.yml'), 'r', encoding='utf-8') as result:
-            with open('metadata/rewrite-yml/org.fdroid.fdroid.yml', 'r', encoding='utf-8') as orig:
-                self.maxDiff = None
-                self.assertEqual(result.read(), orig.read())
-
-    def test_rewrite_yaml_special_build_params(self):
-
-        # setup/reset test dir if necessary and setup params
-        tmpdir = os.path.join(os.path.dirname(__file__), '..', '.testfiles')
-        if not os.path.exists(tmpdir):
-            os.makedirs(tmpdir)
-        testdir = tempfile.mkdtemp(prefix='test_rewrite_metadata_', dir=tmpdir)
-        fdroidserver.common.config = {'accepted_formats': ['txt', 'yml']}
-
-        # rewrite metadata
-        allapps = fdroidserver.metadata.read_metadata(xref=True)
-        for appid, app in allapps.items():
-            if appid == 'app.with.speacial.build.params':
-                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
-
-        # assert rewrite result
-        with open(os.path.join(testdir, 'app.with.speacial.build.params.yml'), 'r', encoding='utf-8') as result:
-            with open('metadata/rewrite-yml/app.with.speacial.build.params.yml', 'r', encoding='utf-8') as orig:
-                self.maxDiff = None
-                self.assertEqual(result.read(), orig.read())
-
-
-if __name__ == "__main__":
-    parser = optparse.OptionParser()
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="Spew out even more information than normal")
-    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
-
-    newSuite = unittest.TestSuite()
-    newSuite.addTest(unittest.makeSuite(RewritemetaTest))
-    unittest.main()