Fix comment preservation in java_cpp_enum.py.

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 184 matching lines @@
     self.assertEqual(2, len(definitions))
     definition = definitions[0]
     self.assertEqual('OverrideName', definition.class_name)
 
     definition = definitions[1]
     self.assertEqual('OtherOverride', definition.class_name)
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 1)]),
                      definition.entries)
 
-  def testParseTwoEnums(self):
+  def testParsePreservesCommentsWhenPrefixStripping(self):
     test_data = """
       // GENERATED_JAVA_ENUM_PACKAGE: test.namespace
       enum EnumOne {
         ENUM_ONE_A = 1,
         // Comment there
         ENUM_ONE_B = A,
       };
 
       enum EnumIgnore {
         C, D, E
       };
 
       // GENERATED_JAVA_ENUM_PACKAGE: other.package
       // GENERATED_JAVA_PREFIX_TO_STRIP: P_
       enum EnumTwo {
         P_A,
         // This comment spans
         // two lines.
         P_B
       };
     """.split('\n')
     definitions = HeaderParser(test_data).ParseDefinitions()
     self.assertEqual(2, len(definitions))
     definition = definitions[0]
     self.assertEqual('EnumOne', definition.class_name)
     self.assertEqual('test.namespace', definition.enum_package)
     self.assertEqual(collections.OrderedDict([('A', '1'),
                                               ('B', 'A')]),
                      definition.entries)
-    self.assertEqual(collections.OrderedDict([('ENUM_ONE_B', 'Comment there')]),
+    self.assertEqual(collections.OrderedDict([('B', 'Comment there')]),
                      definition.comments)
     definition = definitions[1]
     self.assertEqual('EnumTwo', definition.class_name)
     self.assertEqual('other.package', definition.enum_package)
     self.assertEqual(collections.OrderedDict(
-        [('P_B', 'This comment spans two lines.')]), definition.comments)
+        [('B', 'This comment spans two lines.')]), definition.comments)
     self.assertEqual(collections.OrderedDict([('A', 0),
                                               ('B', 1)]),
                      definition.entries)
 
+  def testParseTwoEnums(self):
+    test_data = """
+      // GENERATED_JAVA_ENUM_PACKAGE: test.namespace
+      enum AnEnum {
+        ENUM_ONE_A = 1,
+        ENUM_ONE_B = A,
+      };
+
+      enum EnumIgnore {
+        C, D, E
+      };
+
+      // GENERATED_JAVA_ENUM_PACKAGE: other.package
+      enum EnumTwo {
+        P_A,
+        P_B
+      };
+    """.split('\n')
+    definitions = HeaderParser(test_data).ParseDefinitions()
+    self.assertEqual(2, len(definitions))
+    definition = definitions[0]
+    self.assertEqual('AnEnum', definition.class_name)
+    self.assertEqual('test.namespace', definition.enum_package)
+    self.assertEqual(collections.OrderedDict([('ENUM_ONE_A', '1'),
+                                              ('ENUM_ONE_B', 'A')]),
+                     definition.entries)
+    definition = definitions[1]
+    self.assertEqual('EnumTwo', definition.class_name)
+    self.assertEqual('other.package', definition.enum_package)
+    self.assertEqual(collections.OrderedDict([('P_A', 0),
+                                              ('P_B', 1)]),
+                     definition.entries)
+
   def testParseThrowsOnUnknownDirective(self):
     test_data = """
       // GENERATED_JAVA_UNKNOWN: Value
       enum EnumName {
         VALUE_ONE,
       };
     """.split('\n')
     with self.assertRaises(Exception):
       HeaderParser(test_data).ParseDefinitions()
 
@@ skipping 273 matching lines @@
   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:])