Android: uses "import" section and inner classes for obtaining qualified JNI parameters.

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 38 matching lines @@
       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')
 
   def testNatives(self):
     test_data = """"
+    interface OnFrameAvailableListener {}
     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(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 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);
     """
+    jni_generator.JniParams.ExtractImportsAndInnerClasses(test_data)
     natives = jni_generator.ExtractNatives(test_data)
     golden_natives = [
         NativeMethod(return_type='int', static=False,
                      name='Init',
                      params=[],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='void', static=False, name='Destroy',
                      params=[Param(datatype='int',
                                    name='nativeChromeBrowserProvider')],
@@ skipping 287 matching lines @@
 ")"
 "J", reinterpret_cast<void*>(AddBookmarkFromAPI) },
     { "nativeFindAll",
 "("
 "Ljava/lang/String;"
 ")"
 "I", reinterpret_cast<void*>(FindAll) },
     { "nativeGetInnerClass",
 "("
 ")"
-"Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;",
+"Lorg/chromium/example/jni_generator/SampleForTests$OnFrameAvailableListener;",
     reinterpret_cast<void*>(GetInnerClass) },
     { "nativeQueryBitmap",
 "("
 "I"
 "[Ljava/lang/String;"
 "Ljava/lang/String;"
 "[Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
 "Landroid/graphics/Bitmap;", reinterpret_cast<void*>(QueryBitmap) },
@@ skipping 308 matching lines @@
 
   return true;
 }
 
 #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;
+
+    class InnerClass {}
+
     @CalledByNative
-    OnFrameAvailableListener showConfirmInfoBar(int nativeInfoBar,
+    InnerClass showConfirmInfoBar(int nativeInfoBar,
             String buttonOk, String buttonCancel, String title, Bitmap icon) {
         InfoBar infobar = new ConfirmInfoBar(nativeInfoBar, mContext,
                                              buttonOk, buttonCancel,
                                              title, icon);
         return infobar;
     }
     @CalledByNative
-    OnFrameAvailableListener showAutoLoginInfoBar(int nativeInfoBar,
+    InnerClass 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")
@@ skipping 14 matching lines @@
     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);
     """
+    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='OnFrameAvailableListener',
+            return_type='InnerClass',
             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='OnFrameAvailableListener',
+            return_type='InnerClass',
             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 115 matching lines @@
       env, g_TestJni_clazz,
       "showConfirmInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Landroid/graphics/Bitmap;"
 ")"
-"Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;",
+"Lorg/chromium/Foo$InnerClass;",
       &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;"
 ")"
-"Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;",
+"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;
@@ skipping 513 matching lines @@
         if (mNativeSyncSetupFlow != 0) {
             nativeSyncSetupEnded(mNativeSyncSetupFlow);
             mNativeSyncSetupFlow = 0;
         }
     }
     private native void nativeSyncSetupEnded(
         int nativeAndroidSyncSetupFlowHandler);
     """
     jni_from_java = jni_generator.JNIFromJavaSource(test_data, 'foo/bar')
 
-  def testRaisesOnUnknownDatatype(self):
-    test_data = """
-    class MyInnerClass {
-      private native int nativeInit(AnUnknownDatatype p0);
-    }
-    """
-    self.assertRaises(SyntaxError,
-                      jni_generator.JNIFromJavaSource,
-                      test_data, 'foo/bar')
-
   def testRaisesOnNonJNIMethod(self):
     test_data = """
     class MyInnerClass {
       private int Foo(int p0) {
       }
     }
     """
     self.assertRaises(SyntaxError,
                       jni_generator.JNIFromJavaSource,
                       test_data, 'foo/bar')
@@ skipping 17 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)
+  def testImports(self):
+    import_header = """
+// 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.
+
+package org.chromium.content.app;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.SurfaceTexture;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.Surface;
+
+import java.util.ArrayList;
+
+import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
+import org.chromium.content.app.ContentMain;
+import org.chromium.content.browser.SandboxedProcessConnection;
+import org.chromium.content.common.ISandboxedProcessCallback;
+import org.chromium.content.common.ISandboxedProcessService;
+import org.chromium.content.common.SurfaceCallback;
+
+import static org.chromium.Bar.Zoo;
+
+class Foo {
+  public static class BookmarkNode implements Parcelable {
+  }
+  public interface PasswordListObserver {
+  }
+}
+    """
+    jni_generator.JniParams.SetFullyQualifiedClass(
+        'org/chromium/content/app/Foo')
+    jni_generator.JniParams.ExtractImportsAndInnerClasses(import_header)
+    self.assertTrue('Lorg/chromium/content/common/ISandboxedProcessService' in
+                    jni_generator.JniParams._imports)
+    self.assertTrue('Lorg/chromium/Bar/Zoo' in
+                    jni_generator.JniParams._imports)
+    self.assertTrue('Lorg/chromium/content/app/Foo$BookmarkNode' in
+                    jni_generator.JniParams._inner_classes)
+    self.assertTrue('Lorg/chromium/content/app/Foo$PasswordListObserver' in
+                    jni_generator.JniParams._inner_classes)
+
 
 if __name__ == '__main__':
   unittest.main()