Added Network Quality Estimator Real-time interface to Cronet

build/android/gyp/java_cpp_enum_tests.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Tests for enum_preprocess.py.
 
 This test suite containss various tests for the C++ -> Java enum generator.
 """
 
@@ skipping 10 matching lines @@
 sys.path.append(os.path.join(os.path.dirname(__file__), "gyp"))
 from util import build_utils
 
 class TestPreprocess(unittest.TestCase):
   def testOutput(self):
     definition = EnumDefinition(original_enum_name='ClassName',
                                 enum_package='some.package',
                                 entries=[('E1', 1), ('E2', '2 << 2')])
     output = GenerateOutput('path/to/file', definition)
     expected = """
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
 // This file is autogenerated by
 //     %s
 // From
 //     path/to/file
 
 package some.package;
 
@@ skipping 14 matching lines @@
     """.split('\n')
     definitions = HeaderParser(test_data).ParseDefinitions()
     self.assertEqual(1, len(definitions))
     definition = definitions[0]
     self.assertEqual('EnumName', definition.class_name)
     self.assertEqual('test.namespace', definition.enum_package)
     self.assertEqual(collections.OrderedDict([('VALUE_ZERO', 0),
                                               ('VALUE_ONE', 1)]),
                      definition.entries)
 
+  def testParseSimpleEnumWithComments(self):
+    test_data = """
+      // GENERATED_JAVA_ENUM_PACKAGE: test.namespace
+      enum EnumName {
+        // zero
+        VALUE_ZERO,
+
+        VALUE_ONE,
+
+        // two
+        // too
+        VALUE_TWO,
+      };
+    """.split('\n')
+    definitions = HeaderParser(test_data).ParseDefinitions()
+    self.assertEqual(1, len(definitions))
+    definition = definitions[0]
+    self.assertEqual('EnumName', definition.class_name)
+    self.assertEqual('test.namespace', definition.enum_package)
+    self.assertEqual(collections.OrderedDict([('VALUE_ZERO', 0),
+                                              ('VALUE_ONE', 1),
+                                              ('VALUE_TWO', 2)]),
+                     definition.entries)
+    self.assertEqual(collections.OrderedDict([('VALUE_ZERO', [' zero']),
+                                              ('VALUE_ONE', []),
+                                              ('VALUE_TWO', [' two',' too'])]),
+                     definition.comments)
+
   def testParseBitShifts(self):
     test_data = """
       // GENERATED_JAVA_ENUM_PACKAGE: test.namespace
       enum EnumName {
         VALUE_ZERO = 1 << 0,
         VALUE_ONE = 1 << 1,
       };
     """.split('\n')
     definitions = HeaderParser(test_data).ParseDefinitions()
     self.assertEqual(1, len(definitions))
@@ skipping 227 matching lines @@
       // GENERATED_JAVA_ENUM_PACKAGE: (
       enum Foo {
         FOO_A,
       };
     """.split('\n')
     with self.assertRaises(Exception):
       HeaderParser(test_data).ParseDefinitions()
 
   def testEnumValueAssignmentNoneDefined(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('A', None)
-    definition.AppendEntry('B', None)
-    definition.AppendEntry('C', None)
+    definition.AppendEntry('A', None, [' foo'])
+    definition.AppendEntry('B', None, [])
+    definition.AppendEntry('C', None, [' bar', ' goo'])
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 1),
                                               ('C', 2)]),
                      definition.entries)
+    self.assertEqual(collections.OrderedDict([('A', [' foo']),
+                                              ('B', []),
+                                              ('C', [' bar', ' goo'])]),
+                     definition.comments)
 
   def testEnumValueAssignmentAllDefined(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('A', '1')
-    definition.AppendEntry('B', '2')
-    definition.AppendEntry('C', '3')
+    definition.AppendEntry('A', '1', [])
+    definition.AppendEntry('B', '2', [])
+    definition.AppendEntry('C', '3', [])
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', '1'),
                                               ('B', '2'),
                                               ('C', '3')]),
                      definition.entries)
 
   def testEnumValueAssignmentReferences(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('A', None)
-    definition.AppendEntry('B', 'A')
-    definition.AppendEntry('C', None)
-    definition.AppendEntry('D', 'C')
+    definition.AppendEntry('A', None, [])
+    definition.AppendEntry('B', 'A', [])
+    definition.AppendEntry('C', None, [])
+    definition.AppendEntry('D', 'C', [])
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 0),
                                               ('C', 1),
                                               ('D', 1)]),
                      definition.entries)
 
   def testEnumValueAssignmentSet(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('A', None)
-    definition.AppendEntry('B', '2')
-    definition.AppendEntry('C', None)
+    definition.AppendEntry('A', None, [])
+    definition.AppendEntry('B', '2', [])
+    definition.AppendEntry('C', None, [])
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 2),
                                               ('C', 3)]),
                      definition.entries)
 
   def testEnumValueAssignmentSetReferences(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('A', None)
-    definition.AppendEntry('B', 'A')
-    definition.AppendEntry('C', 'B')
-    definition.AppendEntry('D', None)
+    definition.AppendEntry('A', None, [])
+    definition.AppendEntry('B', 'A', [])
+    definition.AppendEntry('C', 'B', [])
+    definition.AppendEntry('D', None, [])
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 0),
                                               ('C', 0),
                                               ('D', 1)]),
                      definition.entries)
 
   def testEnumValueAssignmentRaises(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('A', None)
-    definition.AppendEntry('B', 'foo')
-    definition.AppendEntry('C', None)
+    definition.AppendEntry('A', None, [])
+    definition.AppendEntry('B', 'foo', [])
+    definition.AppendEntry('C', None, [])
     with self.assertRaises(Exception):
       definition.Finalize()
 
   def testExplicitPrefixStripping(self):
     definition = EnumDefinition(original_enum_name='c', enum_package='p')
-    definition.AppendEntry('P_A', None)
-    definition.AppendEntry('B', None)
-    definition.AppendEntry('P_C', None)
-    definition.AppendEntry('P_LAST', 'P_C')
+    definition.AppendEntry('P_A', None, [])
+    definition.AppendEntry('B', None, [])
+    definition.AppendEntry('P_C', None, [])
+    definition.AppendEntry('P_LAST', 'P_C', [])
     definition.prefix_to_strip = 'P_'
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 1),
                                               ('C', 2),
                                               ('LAST', 2)]),
                      definition.entries)
 
   def testImplicitPrefixStripping(self):
     definition = EnumDefinition(original_enum_name='ClassName',
                                 enum_package='p')
-    definition.AppendEntry('CLASS_NAME_A', None)
-    definition.AppendEntry('CLASS_NAME_B', None)
-    definition.AppendEntry('CLASS_NAME_C', None)
-    definition.AppendEntry('CLASS_NAME_LAST', 'CLASS_NAME_C')
+    definition.AppendEntry('CLASS_NAME_A', None, [])
+    definition.AppendEntry('CLASS_NAME_B', None, [])
+    definition.AppendEntry('CLASS_NAME_C', None, [])
+    definition.AppendEntry('CLASS_NAME_LAST', 'CLASS_NAME_C', [])
     definition.Finalize()
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 1),
                                               ('C', 2),
                                               ('LAST', 2)]),
                      definition.entries)
 
   def testImplicitPrefixStrippingRequiresAllConstantsToBePrefixed(self):
     definition = EnumDefinition(original_enum_name='Name',
                                 enum_package='p')
-    definition.AppendEntry('A', None)
-    definition.AppendEntry('B', None)
-    definition.AppendEntry('NAME_LAST', None)
+    definition.AppendEntry('A', None, [])
+    definition.AppendEntry('B', None, [])
+    definition.AppendEntry('NAME_LAST', None, [])
     definition.Finalize()
     self.assertEqual(['A', 'B', 'NAME_LAST'], definition.entries.keys())
 
   def testGenerateThrowsOnEmptyInput(self):
     with self.assertRaises(Exception):
       original_do_parse = java_cpp_enum.DoParseHeaderFile
       try:
         java_cpp_enum.DoParseHeaderFile = lambda _: []
         java_cpp_enum.DoGenerate('dir', ['file'])
       finally:
         java_cpp_enum.DoParseHeaderFile = original_do_parse
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option("--stamp", help="File to touch on success.")
   options, _ = parser.parse_args(argv)
 
   suite = unittest.TestLoader().loadTestsFromTestCase(TestPreprocess)
   unittest.TextTestRunner(verbosity=0).run(suite)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 if __name__ == '__main__':
   main(sys.argv[1:])