Android: passes a list of qualified JNI parameters as a param to the generator.

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 36 matching lines @@
     if stripped_golden != stripped_generated:
       print self.id()
       for line in difflib.context_diff(stripped_golden, stripped_generated):
         print line
       print '\n\nGenerated'
       print '=' * 80
       print generated_text
       print '=' * 80
       self.fail('Golden text mismatch')
 
-  # TODO(bulach): Detangle these tests from knowing about classes from Content.
   def testNatives(self):
     test_data = """"
     private native int nativeInit();
     private native void nativeDestroy(int nativeChromeBrowserProvider);
     private native long nativeAddBookmark(
             int nativeChromeBrowserProvider,
             String url, String title, boolean isFolder, long parentId);
     private static native String nativeGetDomainAndRegistry(String url);
     private static native void nativeCreateHistoricalTabFromState(
             byte[] state, int tab_index);
-    private native byte[] nativeGetStateAsByteArray(ContentViewCore view);
+    private native byte[] nativeGetStateAsByteArray(View view);
     private static native String[] nativeGetAutofillProfileGUIDs();
     private native void nativeSetRecognitionResults(
             int sessionId, String[] results);
     private native long nativeAddBookmarkFromAPI(
             int nativeChromeBrowserProvider,
             String url, Long created, Boolean isBookmark,
             Long date, byte[] favicon, String title, Integer visits);
     native int nativeFindAll(String find);
-    private static native BookmarkNode nativeGetDefaultBookmarkFolder();
-    private native SQLiteCursor nativeQueryBookmarkFromAPI(
+    private static native OnFrameAvailableListener nativeGetInnerClass();
+    private native Bitmap nativeQueryBitmap(
             int nativeChromeBrowserProvider,
             String[] projection, String selection,
             String[] selectionArgs, String sortOrder);
     private native void nativeGotOrientation(
             int nativeDataFetcherImplAndroid,
             double alpha, double beta, double gamma);
     """
     natives = jni_generator.ExtractNatives(test_data)
     golden_natives = [
         NativeMethod(return_type='int', static=False,
@@ skipping 30 matching lines @@
         NativeMethod(return_type='void', static=True,
                      name='CreateHistoricalTabFromState',
                      params=[Param(datatype='byte[]',
                                    name='state'),
                              Param(datatype='int',
                                    name='tab_index')],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='byte[]', static=False,
                      name='GetStateAsByteArray',
-                     params=[Param(datatype='ContentViewCore', name='view')],
+                     params=[Param(datatype='View', name='view')],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='String[]', static=True,
                      name='GetAutofillProfileGUIDs', params=[],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='void', static=False,
                      name='SetRecognitionResults',
                      params=[Param(datatype='int', name='sessionId'),
                              Param(datatype='String[]', name='results')],
@@ skipping 19 matching lines @@
                                    name='visits')],
                      java_class_name=None,
                      type='method',
                      p0_type='ChromeBrowserProvider'),
         NativeMethod(return_type='int', static=False,
                      name='FindAll',
                      params=[Param(datatype='String',
                                    name='find')],
                      java_class_name=None,
                      type='function'),
-        NativeMethod(return_type='BookmarkNode', static=True,
-                     name='GetDefaultBookmarkFolder',
+        NativeMethod(return_type='OnFrameAvailableListener', static=True,
+                     name='GetInnerClass',
                      params=[],
                      java_class_name=None,
                      type='function'),
-        NativeMethod(return_type='SQLiteCursor',
+        NativeMethod(return_type='Bitmap',
                      static=False,
-                     name='QueryBookmarkFromAPI',
+                     name='QueryBitmap',
                      params=[Param(datatype='int',
                                    name='nativeChromeBrowserProvider'),
                              Param(datatype='String[]',
                                    name='projection'),
                              Param(datatype='String',
                                    name='selection'),
                              Param(datatype='String[]',
                                    name='selectionArgs'),
                              Param(datatype='String',
                                    name='sortOrder'),
@@ skipping 62 matching lines @@
 
 static jobjectArray GetAutofillProfileGUIDs(JNIEnv* env, jclass clazz);
 
 static void SetRecognitionResults(JNIEnv* env, jobject obj,
     jint sessionId,
     jobjectArray results);
 
 static jint FindAll(JNIEnv* env, jobject obj,
     jstring find);
 
-static jobject GetDefaultBookmarkFolder(JNIEnv* env, jclass clazz);
+static jobject GetInnerClass(JNIEnv* env, jclass clazz);
 
 // Step 2: method stubs.
 static void Destroy(JNIEnv* env, jobject obj,
     jint nativeChromeBrowserProvider) {
   DCHECK(nativeChromeBrowserProvider) << "Destroy";
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   return native->Destroy(env, obj);
 }
 
@@ skipping 18 matching lines @@
     jbyteArray favicon,
     jstring title,
     jobject visits) {
   DCHECK(nativeChromeBrowserProvider) << "AddBookmarkFromAPI";
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   return native->AddBookmarkFromAPI(env, obj, url, created, isBookmark, date,
       favicon, title, visits);
 }
 
-static jobject QueryBookmarkFromAPI(JNIEnv* env, jobject obj,
+static jobject QueryBitmap(JNIEnv* env, jobject obj,
     jint nativeChromeBrowserProvider,
     jobjectArray projection,
     jstring selection,
     jobjectArray selectionArgs,
     jstring sortOrder) {
-  DCHECK(nativeChromeBrowserProvider) << "QueryBookmarkFromAPI";
+  DCHECK(nativeChromeBrowserProvider) << "QueryBitmap";
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
-  return native->QueryBookmarkFromAPI(env, obj, projection, selection,
-      selectionArgs, sortOrder).Release();
+  return native->QueryBitmap(env, obj, projection, selection, selectionArgs,
+      sortOrder).Release();
 }
 
 static void GotOrientation(JNIEnv* env, jobject obj,
     jint nativeDataFetcherImplAndroid,
     jdouble alpha,
     jdouble beta,
     jdouble gamma) {
   DCHECK(nativeDataFetcherImplAndroid) << "GotOrientation";
   DataFetcherImplAndroid* native =
       reinterpret_cast<DataFetcherImplAndroid*>(nativeDataFetcherImplAndroid);
@@ skipping 31 matching lines @@
 ")"
 "Ljava/lang/String;", reinterpret_cast<void*>(GetDomainAndRegistry) },
     { "nativeCreateHistoricalTabFromState",
 "("
 "[B"
 "I"
 ")"
 "V", reinterpret_cast<void*>(CreateHistoricalTabFromState) },
     { "nativeGetStateAsByteArray",
 "("
-"Lorg/chromium/content/browser/ContentViewCore;"
+"Landroid/view/View;"
 ")"
 "[B", reinterpret_cast<void*>(GetStateAsByteArray) },
     { "nativeGetAutofillProfileGUIDs",
 "("
 ")"
 "[Ljava/lang/String;", reinterpret_cast<void*>(GetAutofillProfileGUIDs) },
     { "nativeSetRecognitionResults",
 "("
 "I"
 "[Ljava/lang/String;"
 ")"
 "V", reinterpret_cast<void*>(SetRecognitionResults) },
     { "nativeAddBookmarkFromAPI",
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/Long;"
 "Ljava/lang/Boolean;"
 "Ljava/lang/Long;"
 "[B"
 "Ljava/lang/String;"
 "Ljava/lang/Integer;"
 ")"
 "J", reinterpret_cast<void*>(AddBookmarkFromAPI) },
     { "nativeFindAll",
 "("
 "Ljava/lang/String;"
 ")"
 "I", reinterpret_cast<void*>(FindAll) },
-    { "nativeGetDefaultBookmarkFolder",
+    { "nativeGetInnerClass",
 "("
 ")"
-"Lorg/chromium/chrome/browser/ChromeBrowserProvider$BookmarkNode;",
-    reinterpret_cast<void*>(GetDefaultBookmarkFolder) },
-    { "nativeQueryBookmarkFromAPI",
+"Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;",
+    reinterpret_cast<void*>(GetInnerClass) },
+    { "nativeQueryBitmap",
 "("
 "I"
 "[Ljava/lang/String;"
 "Ljava/lang/String;"
 "[Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
-"Lorg/chromium/chrome/browser/database/SQLiteCursor;",
-    reinterpret_cast<void*>(QueryBookmarkFromAPI) },
+"Landroid/graphics/Bitmap;", reinterpret_cast<void*>(QueryBitmap) },
     { "nativeGotOrientation",
 "("
 "I"
 "D"
 "D"
 "D"
 ")"
 "V", reinterpret_cast<void*>(GotOrientation) },
   };
   const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
@@ skipping 299 matching lines @@
   return true;
 }
 
 #endif  // org_chromium_TestJni_JNI
 """
     self.assertTextEquals(golden_content, h.GetContent())
 
   def testCalledByNatives(self):
     test_data = """"
     @CalledByNative
-    NativeInfoBar showConfirmInfoBar(int nativeInfoBar, String buttonOk,
-                                     String buttonCancel, String title,
-                                     Bitmap icon) {
+    OnFrameAvailableListener showConfirmInfoBar(int nativeInfoBar,
+            String buttonOk, String buttonCancel, String title, Bitmap icon) {
         InfoBar infobar = new ConfirmInfoBar(nativeInfoBar, mContext,
                                              buttonOk, buttonCancel,
                                              title, icon);
         return infobar;
     }
     @CalledByNative
-    NativeInfoBar showAutoLoginInfoBar(int nativeInfoBar,
-                                       String realm, String account,
-                                       String args) {
+    OnFrameAvailableListener showAutoLoginInfoBar(int nativeInfoBar,
+            String realm, String account, String args) {
         AutoLoginInfoBar infobar = new AutoLoginInfoBar(nativeInfoBar, mContext,
                 realm, account, args);
         if (infobar.displayedAccountCount() == 0)
             infobar = null;
         return infobar;
     }
     @CalledByNative("InfoBar")
     void dismiss();
     @SuppressWarnings("unused")
     @CalledByNative
-    private static boolean shouldShowAutoLogin(ContentViewCore contentView,
+    private static boolean shouldShowAutoLogin(View view,
             String realm, String account, String args) {
         AccountManagerContainer accountManagerContainer =
             new AccountManagerContainer((Activity)contentView.getContext(),
             realm, account, args);
         String[] logins = accountManagerContainer.getAccountLogins(null);
         return logins.length != 0;
     }
     @CalledByNative
     static InputStream openUrl(String url) {
         return null;
     }
     @CalledByNative
     private void activateHardwareAcceleration(final boolean activated,
             final int iPid, final int iType,
             final int iPrimaryID, final int iSecondaryID) {
       if (!activated) {
           return
       }
     }
     @CalledByNativeUnchecked
     private void uncheckedCall(int iParam);
     """
     called_by_natives = jni_generator.ExtractCalledByNatives(test_data)
     golden_called_by_natives = [
         CalledByNative(
-            return_type='NativeInfoBar',
+            return_type='OnFrameAvailableListener',
             system_class=False,
             static=False,
             name='showConfirmInfoBar',
             method_id_var_name='showConfirmInfoBar',
             java_class_name='',
             params=[Param(datatype='int', name='nativeInfoBar'),
                     Param(datatype='String', name='buttonOk'),
                     Param(datatype='String', name='buttonCancel'),
                     Param(datatype='String', name='title'),
                     Param(datatype='Bitmap', name='icon')],
             env_call=('Object', ''),
             unchecked=False,
         ),
         CalledByNative(
-            return_type='NativeInfoBar',
+            return_type='OnFrameAvailableListener',
             system_class=False,
             static=False,
             name='showAutoLoginInfoBar',
             method_id_var_name='showAutoLoginInfoBar',
             java_class_name='',
             params=[Param(datatype='int', name='nativeInfoBar'),
                     Param(datatype='String', name='realm'),
                     Param(datatype='String', name='account'),
                     Param(datatype='String', name='args')],
             env_call=('Object', ''),
@@ skipping 10 matching lines @@
             env_call=('Void', ''),
             unchecked=False,
         ),
         CalledByNative(
             return_type='boolean',
             system_class=False,
             static=True,
             name='shouldShowAutoLogin',
             method_id_var_name='shouldShowAutoLogin',
             java_class_name='',
-            params=[Param(datatype='ContentViewCore', name='contentView'),
+            params=[Param(datatype='View', name='view'),
                     Param(datatype='String', name='realm'),
                     Param(datatype='String', name='account'),
                     Param(datatype='String', name='args')],
             env_call=('Boolean', ''),
             unchecked=False,
         ),
         CalledByNative(
             return_type='InputStream',
             system_class=False,
             static=True,
@@ skipping 84 matching lines @@
       env, g_TestJni_clazz,
       "showConfirmInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Landroid/graphics/Bitmap;"
 ")"
-"Lcom/google/android/apps/chrome/infobar/InfoBarContainer$NativeInfoBar;",
+"Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;",
       &g_TestJni_showConfirmInfoBar);
 
   jobject ret =
     env->CallObjectMethod(obj,
       method_id, nativeInfoBar, buttonOk, buttonCancel, title, icon);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 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::TYPE_INSTANCE>(
       env, g_TestJni_clazz,
       "showAutoLoginInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
-"Lcom/google/android/apps/chrome/infobar/InfoBarContainer$NativeInfoBar;",
+"Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;",
       &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;
@@ skipping 11 matching lines @@
 "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
-    contentView,
+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::TYPE_STATIC>(
       env, g_TestJni_clazz,
       "shouldShowAutoLogin",
 
 "("
-"Lorg/chromium/content/browser/ContentViewCore;"
+"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, contentView, realm, account, args);
+      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 =
@@ skipping 505 matching lines @@
     """
     jni_from_java = jni_generator.JNIFromJavaSource(
         test_data, ('com/google/lookhowextremelylongiam/snarf/'
                     'icankeepthisupallday/ReallyLongClassNamesAreAllTheRage'))
     jni_lines = jni_from_java.GetContent().split('\n')
     line = filter(lambda line: line.lstrip().startswith('#ifndef'),
                   jni_lines)[0]
     self.assertTrue(len(line) > 80,
                     ('Expected #ifndef line to be > 80 chars: ', line))
 
+  def testExternalParamList(self):
+    script_dir = os.path.dirname(sys.argv[0])
+    external_param_list = [os.path.join(script_dir, 'class_list.jni')]
+    jni_generator.JniParams.ReadExternalParamList(external_param_list)
+    self.assertTrue('Lorg/chromium/base/SystemMessageHandler' in
+                    jni_generator.JniParams._external_param_list)
+    self.assertRaises(AssertionError,
+                      jni_generator.JniParams.ReadExternalParamList,
+                      external_param_list)
+
 if __name__ == '__main__':
   unittest.main()