Multi-dimension rappor metrics

tools/metrics/rappor/pretty_print_test.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 import unittest
 
 import pretty_print
 
 
@@ skipping 10 matching lines @@
   <summary>
     Fake type for tests.
   </summary>
   <parameters num-cohorts="128" bytes="1" hash-functions="2" fake-prob="0.5"
       fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
       reporting-level="COARSE"/>
 </rappor-parameters>
 
 </rappor-parameter-types>
 
+<flag-sets>
+<!-- Comment 3.5 -->
+
+<flag-set name="TEST_FLAGS">
+  <flag name="FLAG1" description="The first flag."/>
+  <flag name="FLAG2" description="The second flag."/>
+</flag-set>
+
+</flag-sets>
+
 <rappor-metrics>
 <!-- Comment4 -->
 
-<rappor-metric name="Test.Rappor.Metric" type="TEST_RAPPOR_TYPE">
+<rappor-metric name="Test.Rappor.Metric" type="TEST_RAPPOR_TYPE"
+    flags="TEST_FLAGS">
   <owner>user1@chromium.org</owner>
   <owner>user2@chromium.org</owner>
   <summary>
     A fake metric summary.
   </summary>
 </rappor-metric>
 
 </rappor-metrics>
 
 </rappor-configuration>
-""".strip()
+""".lstrip()
 
 BASIC_METRIC = {
   'comments': [],
   'name': 'Test.Rappor.Metric',
   'type': 'TEST_RAPPOR_TYPE',
+  'flags': 'TEST_FLAGS',
   'owners': ['user1@chromium.org', 'user2@chromium.org'],
   'summary': 'A fake metric summary.',
 }
 
 
 class ActionXmlTest(unittest.TestCase):
 
   def testIsPretty(self):
     result = pretty_print.UpdateXML(PRETTY_XML)
-    self.assertEqual(PRETTY_XML, result)
+    self.assertEqual(PRETTY_XML.split('\n'), result.split('\n'))
 
   def testParsing(self):
     comments, config = pretty_print.RAPPOR_XML_TYPE.Parse(PRETTY_XML)
     self.assertEqual(BASIC_METRIC, config['metrics']['metrics'][0])
     self.assertEqual(set(['TEST_RAPPOR_TYPE']),
                      pretty_print.GetTypeNames(config))
 
   def testMissingOwners(self):
     self.assertFalse(pretty_print.HasMissingOwners([BASIC_METRIC]))
     no_owners = BASIC_METRIC.copy()
     no_owners['owners'] = []
     self.assertTrue(pretty_print.HasMissingOwners([no_owners]))
 
   def testInvalidTypes(self):
     self.assertFalse(pretty_print.HasInvalidTypes(
         set(['TEST_RAPPOR_TYPE']), [BASIC_METRIC]))
     self.assertTrue(pretty_print.HasInvalidTypes(
         set(['OTHER_TYPE']), [BASIC_METRIC]))
 
 
 if __name__ == '__main__':
   unittest.main()