Issue 5383 - Add tests for the Chrome and Firefox packagers

tests/test_packagerEdge.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import os
+import xml.etree.ElementTree as ET
+
 import pytest
 
-import xml.etree.ElementTree as ET
-
-from buildtools.tests.tools import run_webext_build

[Vasily Kuznetsov, 2017/09/11 12:50:06]

You can combine all the imports from `buildtools.tests.tools` like this:

    from buildtools.tests.tools import (run_webext_build, locale_files,
                                        copy_metadata, ...)

or like this:

    from buildtools.tests.tools import (
        run_webext_build,
        locale_files,
        copy_metadata,
        ...
    )

The first one is more compact and less cluttered, the second one is even more
readable -- choose your favorite :)

[tlucas, 2017/09/12 11:32:10]

Acknowledged.

[tlucas, 2017/09/13 13:43:24]

Done.

-from buildtools.tests.tools import locale_files
-from buildtools.tests.tools import copy_metadata
-from buildtools.tests.tools import ZipContent
-from buildtools.tests.tools import assert_manifest_content
-from buildtools.tests.tools import assert_all_locales_present
-from buildtools.tests.conftest import ALL_LANGUAGES
-from buildtools import packager
-from buildtools import packagerEdge
-
-
-@pytest.fixture
-def locale_files_edge(tmpdir):
-    return locale_files(ALL_LANGUAGES, '_locales', tmpdir)
-
-
-@pytest.fixture
-def edge_metadata(tmpdir):
-    filename = 'metadata.edge'
-    copy_metadata(filename, tmpdir)
-
-    return packager.readMetadata(str(tmpdir), 'edge')
+from buildtools import packager, packagerEdge
 
 
 @pytest.fixture
 def files():
     """Minimal Files() for testing blockmap."""
     str500 = b''.join(chr(i % 200 + 30) for i in range(500))
     files = packager.Files(set(), set())
     files['Extension/foo.xml'] = str500
     files['Extension/bar.png'] = str500 * 200
     return files
-
-
-@pytest.fixture
-def js_extensions(srcdir):
-    srcdir.mkdir('ext').join('foo.js').write('var foo;')
-    srcdir.join('bar.js').write('var bar;')
 
 
 def blockmap2dict(xml_data):
     """Convert AppxBlockMap.xml to a dict of dicts easier to inspect."""
     return {
         file.get('Name'): {
             'size': file.get('Size'),
             'lfhsize': file.get('LfhSize'),
             'blocks': [b.get('Hash') for b in file]
         }
@@ skipping 48 matching lines @@
         'js': 'application/javascript',
         'json': 'application/json',
         'otf': 'application/octet-stream',
         'png': 'image/png',
         'xml': 'application/xml'
     }
     assert ctm_dict['overrides'] == {
         '/AppxBlockMap.xml': 'application/vnd.ms-appx.blockmap+xml',
         '/AppxManifest.xml': 'application/vnd.ms-appx.manifest+xml'
     }
-
-
-@pytest.mark.usefixtures('locale_files_edge', 'js_extensions')
-@pytest.mark.parametrize('build_release', ['release', 'build'])
-def test_build_edge(build_release, tmpdir, srcdir, edge_metadata):
-    from buildtools import packagerEdge
-    release = build_release == 'release'
-
-    run_webext_build('edge', build_release, srcdir, packagerEdge)
-
-    if release:
-        out_file = 'adblockplusedge-1.2.3.appx'
-    else:
-        out_file = 'adblockplusedge-1.2.3.0.appx'
-
-    with ZipContent(out_file) as package:
-        filenames = set(package.namelist())
-
-        assert_all_locales_present(package, 'Extension/_locales')
-
-        assert 'AppxManifest.xml' in filenames
-        assert 'AppxBlockMap.xml' in filenames
-        assert '[Content_Types].xml' in filenames
-
-        assert 'Extension/ext/foo.js' in filenames
-        assert 'Extension/bar.js' in filenames
-
-        assert package.read('Assets/logo_44.png') == '44'
-        assert package.read('Extension/icons/abp-44.png') == '44'
-
-        if release:
-            filename = 'manifest_edge_True.xml'
-        else:
-            filename = 'manifest_edge_False.xml'
-
-        expected = os.path.join(
-            os.path.dirname(__file__),
-            'expecteddata',
-            filename,
-        )
-        assert_manifest_content(package.read('AppxManifest.xml'), expected)