Added support for string-enum-list.

grit/format/policy_templates/writers/plist_writer_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Unit tests for grit.format.policy_templates.writers.plist_writer'''
 
 
 import os
 import sys
@@ skipping 147 matching lines @@
         <key>pfm_targets</key>
         <array>
           <string>user-managed</string>
         </array>
         <key>pfm_type</key>
         <string>string</string>
       </dict>
     </array>''')
     self.assertEquals(output.strip(), expected_output.strip())
 
+  def testListPolicy(self):
+    # Tests a policy group with a single policy of type 'list'.
+    grd = self.PrepareTest('''
+      {
+        'policy_definitions': [
+          {
+            'name': 'ListGroup',
+            'type': 'group',
+            'desc': '',
+            'caption': '',
+            'policies': [{
+              'name': 'ListPolicy',
+              'type': 'list',
+              'schema': {
+                'type': 'array',
+                'items': { 'type': 'string' },
+              },
+              'supported_on': ['chrome.mac:8-'],
+              'desc': '',
+              'caption': '',
+            }],
+          },
+        ],
+        'placeholders': [],
+        'messages': {},
+      }''')
+    output = self.GetOutput(
+        grd,
+        'fr',
+        {'_chromium' : '1', 'mac_bundle_id': 'com.example.Test'},
+        'plist',
+        'en')
+    expected_output = self._GetExpectedOutputs(
+        'Chromium', 'com.example.Test', '''<array>
+      <dict>
+        <key>pfm_name</key>
+        <string>ListPolicy</string>
+        <key>pfm_description</key>
+        <string/>
+        <key>pfm_title</key>
+        <string/>
+        <key>pfm_targets</key>
+        <array>
+          <string>user-managed</string>
+        </array>
+        <key>pfm_type</key>
+        <string>array</string>
+        <key>pfm_subkeys</key>
+        <array>
+          <dict>
+            <key>pfm_type</key>
+            <string>string</string>
+          </dict>
+        </array>
+      </dict>
+    </array>''')
+    self.assertEquals(output.strip(), expected_output.strip())
+
+  def testStringEnumListPolicy(self):
+    # Tests a policy group with a single policy of type 'list'.

[Joao da Silva, 2014/06/25 16:46:56]

string-enum-list

[Andrew T Wilson (Slow), 2014/06/26 08:08:56]

Done.

+    grd = self.PrepareTest('''
+      {
+        'policy_definitions': [
+          {
+            'name': 'ListGroup',
+            'type': 'group',
+            'desc': '',
+            'caption': '',
+            'policies': [{
+              'name': 'ListPolicy',
+              'type': 'string-enum-list',
+              'schema': {
+                'type': 'array',
+                'items': { 'type': 'string' },
+              },
+              'items': [
+                {'name': 'ProxyServerDisabled', 'value': 'one', 'caption': ''},
+                {'name': 'ProxyServerAutoDetect', 'value': 'two', 'caption': ''},
+              ],
+              'supported_on': ['chrome.mac:8-'],
+              'supported_on': ['chrome.mac:8-'],
+              'desc': '',
+              'caption': '',
+            }],
+          },
+        ],
+        'placeholders': [],
+        'messages': {},
+      }''')
+    output = self.GetOutput(
+        grd,
+        'fr',
+        {'_chromium' : '1', 'mac_bundle_id': 'com.example.Test'},
+        'plist',
+        'en')
+    expected_output = self._GetExpectedOutputs(
+        'Chromium', 'com.example.Test', '''<array>
+      <dict>
+        <key>pfm_name</key>
+        <string>ListPolicy</string>
+        <key>pfm_description</key>
+        <string/>
+        <key>pfm_title</key>
+        <string/>
+        <key>pfm_targets</key>
+        <array>
+          <string>user-managed</string>
+        </array>
+        <key>pfm_type</key>
+        <string>array</string>
+        <key>pfm_subkeys</key>
+        <array>
+          <dict>
+            <key>pfm_type</key>
+            <string>string</string>

[Joao da Silva, 2014/06/25 16:46:57]

See the int-enum example below: it's possible to enumerate the valid values
here. It'd be cool to do the same for string-enum-list.

[Andrew T Wilson (Slow), 2014/06/26 08:08:56]

I'm trying really hard not to have to actually test that the output works on all
different platforms - that's why I'm trying to make the string-enum-list output
look exactly like list output. If I make the change you describe, I'd have to go
off and make sure that the resulting template works, and I don't want to do that
for this change - the motivation for this change is primarily to enable more
readable documentation.

If you're setup to test the output template on my behalf, I'm happy to drive a
followup CL with this change that you can test.

[Joao da Silva, 2014/06/26 11:34:07]

That's cool, I can do the testing for the followup CL.

+          </dict>
+        </array>
+      </dict>
+    </array>''')
+    self.assertEquals(output.strip(), expected_output.strip())
+
   def testIntPolicy(self):
     # Tests a policy group with a single policy of type 'int'.
     grd = self.PrepareTest('''
       {
         'policy_definitions': [
           {
             'name': 'IntGroup',
             'type': 'group',
             'caption': '',
             'desc': '',
@@ skipping 222 matching lines @@
         {'_google_chrome': '1', 'mac_bundle_id': 'com.example.Test2'},
         'plist',
         'en')
     expected_output = self._GetExpectedOutputs(
         'Google_Chrome', 'com.example.Test2', '''<array/>''')
     self.assertEquals(output.strip(), expected_output.strip())
 
 
 if __name__ == '__main__':
   unittest.main()