diff options
author | joaodasilva@chromium.org <joaodasilva@chromium.org> | 2014-08-28 15:34:40 +0000 |
---|---|---|
committer | joaodasilva@chromium.org <joaodasilva@chromium.org> | 2014-08-28 15:34:40 +0000 |
commit | 77abf65c1d72af6fb7f9ef6f50cdf29fcf42d0a1 (patch) | |
tree | df69fa5d6c229b887eec6ad4064eda26250519ea | |
parent | 0ad0c7e8adfe4d22dfd7c60957e8e4e410c5c33d (diff) | |
download | grit-77abf65c1d72af6fb7f9ef6f50cdf29fcf42d0a1.tar.gz |
Link to the documentation for complex policies on Windows.
This change also makes that description localized.
BUG=chromium:381627
R=pastarmovj@chromium.org
Review URL: https://codereview.chromium.org/515923002
git-svn-id: http://grit-i18n.googlecode.com/svn/trunk@175 7262f16d-afe8-6277-6482-052fa10e57b1
-rw-r--r-- | grit/format/policy_templates/writers/doc_writer.py | 4 | ||||
-rw-r--r-- | grit/format/policy_templates/writers/doc_writer_unittest.py | 56 |
2 files changed, 59 insertions, 1 deletions
diff --git a/grit/format/policy_templates/writers/doc_writer.py b/grit/format/policy_templates/writers/doc_writer.py index af530f1..62c762f 100644 --- a/grit/format/policy_templates/writers/doc_writer.py +++ b/grit/format/policy_templates/writers/doc_writer.py @@ -645,13 +645,15 @@ class DocWriter(xml_formatted_writer.XMLFormattedWriter): 'dict': 'Dictionary', 'external': 'External data reference', } + reg_dict = 'REG_SZ; %s' % self._GetLocalizedMessage( + 'complex_policies_on_windows') self._REG_TYPE_MAP = { 'string': 'REG_SZ', 'int': 'REG_DWORD', 'main': 'REG_DWORD', 'int-enum': 'REG_DWORD', 'string-enum': 'REG_SZ', - 'dict': 'REG_SZ, encoded as a JSON string', + 'dict': reg_dict, } # The CSS style-sheet used for the document. It will be used in Google # Sites, which strips class attributes from HTML tags. To work around this, diff --git a/grit/format/policy_templates/writers/doc_writer_unittest.py b/grit/format/policy_templates/writers/doc_writer_unittest.py index 7a71044..1508082 100644 --- a/grit/format/policy_templates/writers/doc_writer_unittest.py +++ b/grit/format/policy_templates/writers/doc_writer_unittest.py @@ -41,6 +41,7 @@ class DocWriterUnittest(writer_unittest_common.WriterUnittestCommon): }) self.writer.messages = { 'doc_back_to_top': {'text': '_test_back_to_top'}, + 'doc_complex_policies_on_windows': {'text': '_test_complex_policies_win'}, 'doc_data_type': {'text': '_test_data_type'}, 'doc_description': {'text': '_test_description'}, 'doc_description_column_title': { @@ -415,6 +416,61 @@ See <a href="http://policy-explanation.example.com">http://policy-explanation.ex '<dd>0x00000000 (Windows), false (Linux), <false /> (Mac)</dd>' '</dl></root>') + def testAddDictPolicyDetails(self): + # Test if the definition list (<dl>) of policy details is created correctly + # for 'dict' policies. + policy = { + 'type': 'dict', + 'name': 'TestPolicyName', + 'caption': 'TestPolicyCaption', + 'desc': 'TestPolicyDesc', + 'supported_on': [{ + 'product': 'chrome', + 'platforms': ['win', 'mac', 'linux'], + 'since_version': '8', + 'until_version': '', + }], + 'features': {'dynamic_refresh': False}, + 'example_value': { 'foo': 123 } + } + self.writer.messages['doc_since_version'] = {'text': '...$6...'} + self.writer._AddPolicyDetails(self.doc_root, policy) + self.assertEquals( + self.doc_root.toxml(), + '<root><dl>' + '<dt style="style_dt;">_test_data_type</dt><dd>Dictionary (REG_SZ; _test_complex_policies_win)</dd>' + '<dt style="style_dt;">_test_win_reg_loc</dt>' + '<dd style="style_.monospace;">MockKey\TestPolicyName</dd>' + '<dt style="style_dt;">_test_mac_linux_pref_name</dt>' + '<dd style="style_.monospace;">TestPolicyName</dd>' + '<dt style="style_dt;">_test_supported_on</dt>' + '<dd>' + '<ul style="style_ul;">' + '<li>Chrome (Windows, Mac, Linux) ...8...</li>' + '</ul>' + '</dd>' + '<dt style="style_dt;">_test_supported_features</dt>' + '<dd>_test_feature_dynamic_refresh: _test_not_supported</dd>' + '<dt style="style_dt;">_test_description</dt><dd>TestPolicyDesc</dd>' + '<dt style="style_dt;">_test_example_value</dt>' + '<dd>' + '<dl style="style_dd dl;">' + '<dt>Windows:</dt>' + '<dd style="style_.monospace;style_.pre;">MockKey\TestPolicyName = {"foo": 123}</dd>' + '<dt>Linux:</dt>' + '<dd style="style_.monospace;">TestPolicyName: {"foo": 123}</dd>' + '<dt>Mac:</dt>' + '<dd style="style_.monospace;style_.pre;">' + '<key>TestPolicyName</key>\n' + '<dict>\n' + ' <key>foo</key>\n' + ' <integer>123</integer>\n' + '</dict>' + '</dd>' + '</dl>' + '</dd>' + '</dl></root>') + def testAddPolicyNote(self): # TODO(jkummerow): The functionality tested by this test is currently not # used for anything and will probably soon be removed. |