Android: upstream few more jni_generator changes.

base/android/jni_generator/jni_generator_tests.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.
 
 """Tests for jni_generator.py.
 
 This test suite contains various tests for the JNI generator.
 It exercises the low-level parser all the way up to the
 code generator and ensures the output matches a golden
@@ skipping 22 matching lines @@
   """The mock options object which is passed to the jni_generator.py script."""
 
   def __init__(self):
     self.namespace = None
     self.script_name = SCRIPT_NAME
     self.includes = INCLUDES
     self.pure_native_methods = False
     self.ptr_type = 'long'
     self.jni_init_native_name = None
     self.eager_called_by_natives = False
+    self.cpp = 'cpp'
+    self.javap = 'javap'
 
 
 class TestGenerator(unittest.TestCase):
   def assertObjEquals(self, first, second):
     dict_first = first.__dict__
     dict_second = second.__dict__
     self.assertEquals(dict_first.keys(), dict_second.keys())
     for key, value in dict_first.iteritems():
       if (type(value) is list and len(value) and
           isinstance(type(value[0]), object)):
@@ skipping 909 matching lines @@
     self.assertGoldenTextEquals(jni_from_java.GetContent())
 
   def testJNIInitNativeNameOption(self):
     test_data = """
     package org.chromium.example.jni_generator;
 
     /** The pointer to the native Test. */
     long nativeTest;
 
     class Test {
-        private static native boolean initNativeClass();
+        private static native boolean nativeInitNativeClass();

[rmcilroy, 2014/01/14 10:13:52]

nit - nativeInitClass (for all)?

[bulach, 2014/01/16 11:03:49]

the first "native" is stripped from the C++ counter part, so the name in the
other side is "InitNativeClass"... it could be simplified, but it doesn't look
"too" redundant when looked from the other side :)
I'll leave as it is for consistency with the downstream version..

         private static native int nativeMethod(long nativeTest, int arg1);
     }
     """
     options = TestOptions()
-    options.jni_init_native_name = 'initNativeClass'
+    options.jni_init_native_name = 'nativeInitNativeClass'
     jni_from_java = jni_generator.JNIFromJavaSource(
         test_data, 'org/chromium/example/jni_generator/Test', options)
     self.assertGoldenTextEquals(jni_from_java.GetContent())
 
   def testEagerCalledByNativesOption(self):
     test_data = """
     package org.chromium.example.jni_generator;
 
     /** The pointer to the native Test. */
     long nativeTest;
 
     class Test {
-        private static native boolean initNativeClass();
+        private static native boolean nativeInitNativeClass();
         private static native int nativeMethod(long nativeTest, int arg1);
         @CalledByNative
         private void testMethodWithParam(int iParam);
         @CalledByNative
         private static int testStaticMethodWithParam(int iParam);
         @CalledByNative
         private static double testMethodWithNoParam();
         @CalledByNative
         private static String testStaticMethodWithNoParam();
     }
     """
     options = TestOptions()
-    options.jni_init_native_name = 'initNativeClass'
+    options.jni_init_native_name = 'nativeInitNativeClass'
     options.eager_called_by_natives = True
     jni_from_java = jni_generator.JNIFromJavaSource(
         test_data, 'org/chromium/example/jni_generator/Test', options)
     self.assertGoldenTextEquals(jni_from_java.GetContent())
 
 if __name__ == '__main__':
   unittest.main()