Updating JNIAdditionalImport to allow more than one import.

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 130 matching lines @@
     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.SetFullyQualifiedClass(
+        'org/chromium/example/jni_generator/SampleForTests')

[qsr, 2014/05/23 08:11:38]

This is necessary because this test was wrong -> the class was the one of
whichever test was run before, which is wrong. It put the class that was used in
the golden file.

     jni_generator.JniParams.ExtractImportsAndInnerClasses(test_data)
     natives = jni_generator.ExtractNatives(test_data, 'int')
     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',
@@ skipping 865 matching lines @@
       jni_generator.JNIFromJavaSource(
           test_data % {'IMPORT': import_clause},
           'org/chromium/android_webview/AwContentStatics',
           TestOptions())
     # Ensure it raises without the import.
     self.assertRaises(SyntaxError, lambda: generate(''))
 
     # Ensure it's fine with the import.
     generate('import java.lang.Runnable;')
 
-  def testJNIAdditionalImport(self):
+  def testSingleJNIAdditionalImport(self):
     test_data = """
     package org.chromium.foo;
 
     @JNIAdditionalImport(Bar.class)
     class Foo {
 
     @CalledByNative
     private static void calledByNative(Bar.Callback callback) {
     }
 
     private static native void nativeDoSomething(Bar.Callback callback);
     }
     """
     jni_from_java = jni_generator.JNIFromJavaSource(test_data,
                                                     'org/chromium/foo/Foo',
                                                     TestOptions())
     self.assertGoldenTextEquals(jni_from_java.GetContent())
 
+  def testMultipleJNIAdditionalImport(self):
+    test_data = """
+    package org.chromium.foo;
+
+    @JNIAdditionalImport({Bar1.class, Bar2.class})
+    class Foo {
+
+    @CalledByNative
+    private static void calledByNative(Bar1.Callback callback1,
+                                       Bar2.Callback callback2) {
+    }
+
+    private static native void nativeDoSomething(Bar1.Callback callback1,
+                                                 Bar2.Callback callback2);
+    }
+    """
+    jni_from_java = jni_generator.JNIFromJavaSource(test_data,
+                                                    'org/chromium/foo/Foo',
+                                                    TestOptions())
+    self.assertGoldenTextEquals(jni_from_java.GetContent())
+
 
 if __name__ == '__main__':
   unittest.main()