Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: tests/test_packagerEdge.py

Issue 29501558: Issue 5383 - Add tests for the Chrome and Firefox packagers (Closed)
Patch Set: Merge test were possible Created Sept. 25, 2017, 10:33 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/metadata.gecko-webext ('k') | tests/test_packagerWebExt.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/test_packagerEdge.py
diff --git a/tests/test_packagerEdge.py b/tests/test_packagerEdge.py
index 75a0743b166466aaa4c53401d7fe5784948fd871..0edf93be9c72f9827cd5aac6e4528b4e479fbbcd 100644
--- a/tests/test_packagerEdge.py
+++ b/tests/test_packagerEdge.py
@@ -2,65 +2,23 @@
# 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 ConfigParser
-import json
-import os
-import shutil
-import xml.etree.ElementTree as ET
-import zipfile
-
import pytest
-from buildtools import packager, packagerEdge
-
-TEST_DIR = os.path.dirname(__file__)
-TEST_METADATA = os.path.join(TEST_DIR, 'metadata.edge')
-CHARS = b''.join(chr(i % 200 + 30) for i in range(500))
-MESSAGES_EN_US = json.dumps({
- 'name': {'message': 'Adblock Plus'},
- 'name_devbuild': {'message': 'devbuild-marker'},
- 'description': {
- 'message': 'Adblock Plus is the most popular ad blocker ever, '
- 'and also supports websites by not blocking '
- 'unobstrusive ads by default (configurable).'
- },
-})
-
+import xml.etree.ElementTree as ET
-@pytest.fixture
-def metadata():
- """Loaded metadata config."""
- conf_parser = ConfigParser.ConfigParser()
- conf_parser.read(TEST_METADATA)
- return conf_parser
+from buildtools import packager, packagerEdge
@pytest.fixture
def files():
- """Minimal Files() for testing manifest and blockmap."""
+ """Minimal Files() for testing blockmap."""
+ str500 = b''.join(chr(i % 200 + 30) for i in range(500))
files = packager.Files(set(), set())
- for size in ['44', '50', '150']:
- files['Assets/logo_{}.png'.format(size)] = CHARS
- files['Extension/_locales/en_US/messages.json'] = MESSAGES_EN_US
- files['Extension/foo.xml'] = CHARS
- files['Extension/bar.png'] = CHARS * 200
+ files['Extension/foo.xml'] = str500
+ files['Extension/bar.png'] = str500 * 200
return files
-@pytest.fixture
-def srcdir(tmpdir):
- """Source directory for building the package."""
- srcdir = tmpdir.mkdir('src')
- shutil.copy(TEST_METADATA, str(srcdir.join('metadata.edge')))
- for size in ['44', '50', '150']:
- path = srcdir.join('chrome', 'icons', 'abp-{}.png'.format(size))
- path.write(size, ensure=True)
- localedir = srcdir.mkdir('_locales')
- en_us_dir = localedir.mkdir('en_US')
- en_us_dir.join('messages.json').write(MESSAGES_EN_US)
- return srcdir
-
-
def blockmap2dict(xml_data):
"""Convert AppxBlockMap.xml to a dict of dicts easier to inspect."""
return {
@@ -127,133 +85,3 @@ def test_full_content_types_map():
'/AppxBlockMap.xml': 'application/vnd.ms-appx.blockmap+xml',
'/AppxManifest.xml': 'application/vnd.ms-appx.manifest+xml'
}
-
-
-def test_create_appx_manifest(metadata, files):
- namespaces = {
- 'ns': 'http://schemas.microsoft.com/'
- 'appx/manifest/foundation/windows10',
- 'uap': 'http://schemas.microsoft.com/appx/manifest/uap/windows10',
- 'uap3': 'http://schemas.microsoft.com/appx/manifest/uap/windows10/3',
- }
-
- def first(elem):
- return elem[0]
-
- def text(elem):
- return elem.text
-
- def attr(attr):
- def wrapper(elem):
- return elem.attrib[attr]
- return wrapper
-
- base = [
- ('.//*', [len], 21.0),
- ('./ns:Identity', [first, attr('Publisher')],
- 'CN=4F066043-8AFE-41C9-B762-6C15E77E3F88'),
- ('./ns:Properties/ns:PublisherDisplayName', [first, text],
- 'Eyeo GmbH'),
- ('./ns:Properties/ns:Logo', [first, text], 'Assets\\logo_50.png'),
- ('./ns:Dependencies/ns:TargetDeviceFamily',
- [first, attr('MinVersion')],
- '10.0.14332.0'),
- ('./ns:Dependencies/ns:TargetDeviceFamily',
- [first, attr('MaxVersionTested')],
- '12.0.0.0'),
- ('./ns:Applications/ns:Application/uap:VisualElements',
- [first, attr('Square150x150Logo')],
- 'Assets\\logo_150.png'),
- ('./ns:Applications/ns:Application/uap:VisualElements',
- [first, attr('Square44x44Logo')],
- 'Assets\\logo_44.png'),
- ('./ns:Applications/ns:Application/uap:VisualElements',
- [first, attr('Description')],
- 'Adblock Plus is the most popular ad blocker ever, and also '
- 'supports websites by not blocking unobstrusive ads by '
- 'default (configurable).'),
- ('./ns:Applications/ns:Application/uap:VisualElements',
- [first, attr('BackgroundColor')],
- 'red'),
- ]
-
- devbuild = base + [
- ('./ns:Identity', [first, attr('Name')],
- 'EyeoGmbH.AdblockPlusdevelopmentbuild'),
- ('./ns:Identity', [first, attr('Version')], '1.2.1000.0'),
- ('./ns:Properties/ns:DisplayName', [first, text], 'devbuild-marker'),
- ('./ns:Applications/ns:Application/uap:VisualElements',
- [first, attr('DisplayName')],
- 'devbuild-marker'),
- ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
- 'uap3:AppExtension',
- [first, attr('Id')],
- 'EdgeExtension'),
- ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
- 'uap3:AppExtension',
- [first, attr('DisplayName')],
- 'devbuild-marker'),
- ]
-
- release = base + [
- ('./ns:Identity', [first, attr('Name')], 'EyeoGmbH.AdblockPlus'),
- ('./ns:Identity', [first, attr('Version')], '1.2.3.0'),
- ('./ns:Properties/ns:DisplayName', [first, text], 'Adblock Plus'),
- ('./ns:Applications/ns:Application/uap:VisualElements',
- [first, attr('DisplayName')],
- 'Adblock Plus'),
- ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
- 'uap3:AppExtension',
- [first, attr('Id')],
- '1.0'),
- ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
- 'uap3:AppExtension',
- [first, attr('DisplayName')],
- 'Adblock Plus'),
- ]
-
- for args, pairs in [(('1000', False), devbuild), ((None, True), release)]:
- manifest = ET.fromstring(packagerEdge.create_appx_manifest(
- {'metadata': metadata}, files, *args
- ))
- for expression, modifiers, value in pairs:
- res = reduce(
- lambda val, func: func(val),
- modifiers,
- manifest.findall(expression, namespaces=namespaces))
- assert res == value
-
-
-def test_move_files_to_extension():
- files = packager.Files(set(), set())
- files['foo.xml'] = CHARS
- files['foo/bar.xml'] = CHARS
- files['Extension/foo.xml'] = CHARS
- packagerEdge.move_files_to_extension(files)
- assert set(files.keys()) == {
- 'Extension/foo.xml',
- 'Extension/foo/bar.xml',
- 'Extension/Extension/foo.xml'
- }
-
-
-def test_create_build(tmpdir, srcdir):
- out_file = str(tmpdir.join('abp.appx'))
- packagerEdge.createBuild(str(srcdir), outFile=out_file, releaseBuild=True)
- appx = zipfile.ZipFile(out_file)
-
- names = set(appx.namelist())
- assert 'AppxManifest.xml' in names
- assert 'AppxBlockMap.xml' in names
- assert '[Content_Types].xml' in names
-
- assert 'devbuild-marker' not in appx.read('AppxManifest.xml')
- assert appx.read('Assets/logo_44.png') == '44'
- assert appx.read('Extension/icons/abp-44.png') == '44'
-
-
-def test_create_devbuild(tmpdir, srcdir):
- out_file = str(tmpdir.join('abp.appx'))
- packagerEdge.createBuild(str(srcdir), outFile=out_file, releaseBuild=False)
- appx = zipfile.ZipFile(out_file)
- assert 'devbuild-marker' in appx.read('AppxManifest.xml')
« no previous file with comments | « tests/metadata.gecko-webext ('k') | tests/test_packagerWebExt.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld