Android: fixes jni_generator for @CalledByNative with generics.

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 705 matching lines @@
 
 #endif  // org_chromium_TestJni_JNI
 """
     self.assertTextEquals(golden_content, h.GetContent())
 
   def testCalledByNatives(self):
     test_data = """"
     import android.graphics.Bitmap;
     import android.view.View;
     import java.io.InputStream;
+    import java.util.List;
 
     class InnerClass {}
 
     @CalledByNative
     InnerClass showConfirmInfoBar(int nativeInfoBar,
             String buttonOk, String buttonCancel, String title, Bitmap icon) {
         InfoBar infobar = new ConfirmInfoBar(nativeInfoBar, mContext,
                                              buttonOk, buttonCancel,
                                              title, icon);
         return infobar;
@@ skipping 56 matching lines @@
     public double[] returnDoubleArray();
 
     @CalledByNative
     public Object[] returnObjectArray();
 
     @CalledByNative
     public byte[][] returnArrayOfByteArray();
 
     @CalledByNative
     public Bitmap.CompressFormat getCompressFormat();
+
+    @CalledByNative
+    public List<Bitmap.CompressFormat> getCompressFormatList();
     """
     jni_generator.JniParams.SetFullyQualifiedClass('org/chromium/Foo')
     jni_generator.JniParams.ExtractImportsAndInnerClasses(test_data)
     called_by_natives = jni_generator.ExtractCalledByNatives(test_data)
     golden_called_by_natives = [
         CalledByNative(
             return_type='InnerClass',
             system_class=False,
             static=False,
             name='showConfirmInfoBar',
@@ skipping 187 matching lines @@
             return_type='Bitmap.CompressFormat',
             system_class=False,
             static=False,
             name='getCompressFormat',
             method_id_var_name='getCompressFormat',
             java_class_name='',
             params=[],
             env_call=('Void', ''),
             unchecked=False,
         ),
+        CalledByNative(
+            return_type='List<Bitmap.CompressFormat>',
+            system_class=False,
+            static=False,
+            name='getCompressFormatList',
+            method_id_var_name='getCompressFormatList',
+            java_class_name='',
+            params=[],
+            env_call=('Void', ''),
+            unchecked=False,
+        ),
     ]
     self.assertListEquals(golden_called_by_natives, called_by_natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
                                              [], called_by_natives)
     golden_content = """\
 // 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.
 
 // This file is autogenerated by
@@ skipping 28 matching lines @@
 static base::subtle::AtomicWord g_TestJni_showConfirmInfoBar = 0;
 static ScopedJavaLocalRef<jobject> Java_TestJni_showConfirmInfoBar(JNIEnv* env,
     jobject obj, jint nativeInfoBar,
     jstring buttonOk,
     jstring buttonCancel,
     jstring title,
     jobject icon) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_TestJni_clazz,
       "showConfirmInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Landroid/graphics/Bitmap;"
@@ skipping 10 matching lines @@
 
 static base::subtle::AtomicWord g_TestJni_showAutoLoginInfoBar = 0;
 static ScopedJavaLocalRef<jobject> Java_TestJni_showAutoLoginInfoBar(JNIEnv*
     env, jobject obj, jint nativeInfoBar,
     jstring realm,
     jstring account,
     jstring args) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_TestJni_clazz,
       "showAutoLoginInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
 "Lorg/chromium/Foo$InnerClass;",
       &g_TestJni_showAutoLoginInfoBar);
 
   jobject ret =
     env->CallObjectMethod(obj,
       method_id, nativeInfoBar, realm, account, args);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static base::subtle::AtomicWord g_InfoBar_dismiss = 0;
 static void Java_InfoBar_dismiss(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InfoBar_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InfoBar_clazz,
       "dismiss",
 
 "("
 ")"
 "V",
       &g_InfoBar_dismiss);
 
   env->CallVoidMethod(obj,
       method_id);
   base::android::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_TestJni_shouldShowAutoLogin = 0;
 static jboolean Java_TestJni_shouldShowAutoLogin(JNIEnv* env, jobject view,
     jstring realm,
     jstring account,
     jstring args) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, g_TestJni_clazz,
       "shouldShowAutoLogin",
 
 "("
 "Landroid/view/View;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
 "Z",
       &g_TestJni_shouldShowAutoLogin);
 
   jboolean ret =
     env->CallStaticBooleanMethod(g_TestJni_clazz,
       method_id, view, realm, account, args);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_TestJni_openUrl = 0;
 static ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv* env, jstring
     url) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, g_TestJni_clazz,
       "openUrl",
 
 "("
 "Ljava/lang/String;"
 ")"
 "Ljava/io/InputStream;",
       &g_TestJni_openUrl);
 
   jobject ret =
     env->CallStaticObjectMethod(g_TestJni_clazz,
       method_id, url);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static base::subtle::AtomicWord g_TestJni_activateHardwareAcceleration = 0;
 static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj,
     jboolean activated,
     jint iPid,
     jint iType,
     jint iPrimaryID,
     jint iSecondaryID) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_TestJni_clazz,
       "activateHardwareAcceleration",
 
 "("
 "Z"
 "I"
 "I"
 "I"
 "I"
 ")"
 "V",
       &g_TestJni_activateHardwareAcceleration);
 
   env->CallVoidMethod(obj,
       method_id, activated, iPid, iType, iPrimaryID, iSecondaryID);
   base::android::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_TestJni_uncheckedCall = 0;
 static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, jint iParam) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
-  base::android::MethodID::LazyGet<
+      base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_TestJni_clazz,
       "uncheckedCall",
 
 "("
 "I"
 ")"
 "V",
       &g_TestJni_uncheckedCall);
 
@@ skipping 181 matching lines @@
 
   jobjectArray ret =
     static_cast<jobjectArray>(env->CallObjectMethod(obj,
       method_id));
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobjectArray>(env, ret);
 }
 
 static base::subtle::AtomicWord g_TestJni_returnArrayOfByteArray = 0;
 static ScopedJavaLocalRef<jobjectArray>
-Java_TestJni_returnArrayOfByteArray(JNIEnv* env, jobject obj) {
+    Java_TestJni_returnArrayOfByteArray(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_TestJni_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_TestJni_clazz,
       "returnArrayOfByteArray",
 
 "("
 ")"
@@ skipping 23 matching lines @@
 "Landroid/graphics/Bitmap$CompressFormat;",
       &g_TestJni_getCompressFormat);
 
   jobject ret =
     env->CallObjectMethod(obj,
       method_id);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
+static base::subtle::AtomicWord g_TestJni_getCompressFormatList = 0;
+static ScopedJavaLocalRef<jobject> Java_TestJni_getCompressFormatList(JNIEnv*
+    env, jobject obj) {
+  /* Must call RegisterNativesImpl()  */
+  DCHECK(g_TestJni_clazz);
+  jmethodID method_id =
+      base::android::MethodID::LazyGet<
+      base::android::MethodID::TYPE_INSTANCE>(
+      env, g_TestJni_clazz,
+      "getCompressFormatList",
+
+"("
+")"
+"Ljava/util/List;",
+      &g_TestJni_getCompressFormatList);
+
+  jobject ret =
+    env->CallObjectMethod(obj,
+      method_id);
+  base::android::CheckException(env);
+  return ScopedJavaLocalRef<jobject>(env, ret);
+}
+
 // Step 3: RegisterNatives.
 
 static bool RegisterNativesImpl(JNIEnv* env) {
 
   g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetUnscopedClass(env, kTestJniClassPath)));
   g_InfoBar_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetUnscopedClass(env, kInfoBarClassPath)));
   return true;
 }
@@ skipping 483 matching lines @@
 
   def testJniParamsJavaToJni(self):
     self.assertTextEquals('I', JniParams.JavaToJni('int'))
     self.assertTextEquals('[B', JniParams.JavaToJni('byte[]'))
     self.assertTextEquals(
         '[Ljava/nio/ByteBuffer;', JniParams.JavaToJni('java/nio/ByteBuffer[]'))
 
 
 if __name__ == '__main__':
   unittest.main()