Android: fixes for JNI with javap for java7.

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 1565 matching lines @@
         jni_generator.GetMangledMethodName('open',
             [Param(name='p1',
                    datatype='java/lang/String'),],
              'java/io/InputStream'))
 
   def testFromJavaPGenerics(self):
     contents = """
 public abstract class java.util.HashSet<T> extends java.util.AbstractSet<E>
       implements java.util.Set<E>, java.lang.Cloneable, java.io.Serializable {
     public void dummy();
+  Signature: ()V
 }
 """
     jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'),
                                                 TestOptions())
     self.assertEquals(1, len(jni_from_javap.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.
 
@@ skipping 29 matching lines @@
 static void Java_HashSet_dummy(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static void Java_HashSet_dummy(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_HashSet_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_HashSet_clazz,
       "dummy",
-
-"("
-")"
-"V",
+"()V",
       &g_HashSet_dummy);
 
   env->CallVoidMethod(obj,
       method_id);
   base::android::CheckException(env);
 
 }
 
 // Step 3: RegisterNatives.
 
 static bool RegisterNativesImpl(JNIEnv* env) {
 
   g_HashSet_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kHashSetClassPath).obj()));
   return true;
 }
 }  // namespace JNI_HashSet
 
 #endif  // java_util_HashSet_JNI
 """
     self.assertTextEquals(golden_content, jni_from_javap.GetContent())
 
+  def testSnippnetJavap6_7(self):
+    content_javap6 = """
+public class java.util.HashSet {
+public boolean add(java.lang.Object);
+ Signature: (Ljava/lang/Object;)Z
+}
+"""
+
+    content_javap7 = """
+public class java.util.HashSet {
+public boolean add(E);
+  Signature: (Ljava/lang/Object;)Z
+}
+"""
+    jni_from_javap6 = jni_generator.JNIFromJavaP(content_javap6.split('\n'),
+                                                 TestOptions())
+    jni_from_javap7 = jni_generator.JNIFromJavaP(content_javap7.split('\n'),
+                                                 TestOptions())
+    self.assertTrue(jni_from_javap6.GetContent())
+    self.assertTrue(jni_from_javap7.GetContent())
+    # Ensure the javap7 is correctly parsed and uses the Signature field rather
+    # than the "E" parameter.
+    self.assertTextEquals(jni_from_javap6.GetContent(),
+                          jni_from_javap7.GetContent())
+
   def testFromJavaP(self):
     contents = """
-public abstract class java.io.InputStream extends java.lang.Object
-      implements java.io.Closeable{
-    public java.io.InputStream();
-    public int available()       throws java.io.IOException;
-    public void close()       throws java.io.IOException;
-    public void mark(int);
-    public boolean markSupported();
-    public abstract int read()       throws java.io.IOException;
-    public int read(byte[])       throws java.io.IOException;
-    public int read(byte[], int, int)       throws java.io.IOException;
-    public synchronized void reset()       throws java.io.IOException;
-    public long skip(long)       throws java.io.IOException;
+public abstract class java.io.InputStream extends
+  java.lang.Object implements java.io.Closeable{
+public java.io.InputStream();
+  Signature: ()V
+public int available()   throws java.io.IOException;
+  Signature: ()I
+public void close()   throws java.io.IOException;
+  Signature: ()V
+public void mark(int);
+  Signature: (I)V
+public boolean markSupported();
+  Signature: ()Z
+public abstract int read()   throws java.io.IOException;
+  Signature: ()I
+public int read(byte[])   throws java.io.IOException;
+  Signature: ([B)I
+public int read(byte[], int, int)   throws java.io.IOException;
+  Signature: ([BII)I
+public synchronized void reset()   throws java.io.IOException;
+  Signature: ()V
+public long skip(long)   throws java.io.IOException;
+  Signature: (J)J
 }
 """
     jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'),
                                                 TestOptions())
     self.assertEquals(10, len(jni_from_javap.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.
 
@@ skipping 29 matching lines @@
 static jint Java_InputStream_available(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static jint Java_InputStream_available(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "available",
-
-"("
-")"
-"I",
+"()I",
       &g_InputStream_available);
 
   jint ret =
     env->CallIntMethod(obj,
       method_id);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_close = 0;
 static void Java_InputStream_close(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static void Java_InputStream_close(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "close",
-
-"("
-")"
-"V",
+"()V",
       &g_InputStream_close);
 
   env->CallVoidMethod(obj,
       method_id);
   base::android::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_mark = 0;
 static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0)
     __attribute__ ((unused));
 static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "mark",
-
-"("
-"I"
-")"
-"V",
+"(I)V",
       &g_InputStream_mark);
 
   env->CallVoidMethod(obj,
       method_id, p0);
   base::android::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_markSupported = 0;
 static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj)
     __attribute__ ((unused));
 static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "markSupported",
-
-"("
-")"
-"Z",
+"()Z",
       &g_InputStream_markSupported);
 
   jboolean ret =
     env->CallBooleanMethod(obj,
       method_id);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI = 0;
 static jint Java_InputStream_readI(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static jint Java_InputStream_readI(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
-
-"("
-")"
-"I",
+"()I",
       &g_InputStream_readI);
 
   jint ret =
     env->CallIntMethod(obj,
       method_id);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI_AB = 0;
 static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0)
     __attribute__ ((unused));
 static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
-
-"("
-"[B"
-")"
-"I",
+"([B)I",
       &g_InputStream_readI_AB);
 
   jint ret =
     env->CallIntMethod(obj,
       method_id, p0);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI_AB_I_I = 0;
 static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
     p0,
     jint p1,
     jint p2) __attribute__ ((unused));
 static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
     p0,
     jint p1,
     jint p2) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
-
-"("
-"[B"
-"I"
-"I"
-")"
-"I",
+"([BII)I",
       &g_InputStream_readI_AB_I_I);
 
   jint ret =
     env->CallIntMethod(obj,
       method_id, p0, p1, p2);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_reset = 0;
 static void Java_InputStream_reset(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static void Java_InputStream_reset(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "reset",
-
-"("
-")"
-"V",
+"()V",
       &g_InputStream_reset);
 
   env->CallVoidMethod(obj,
       method_id);
   base::android::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_skip = 0;
 static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0)
     __attribute__ ((unused));
 static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "skip",
-
-"("
-"J"
-")"
-"J",
+"(J)J",
       &g_InputStream_skip);
 
   jlong ret =
     env->CallLongMethod(obj,
       method_id, p0);
   base::android::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_Constructor = 0;
 static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env)
     __attribute__ ((unused));
 static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InputStream_clazz);
   jmethodID method_id =
   base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "<init>",
-
-"("
-")"
-"V",
+"()V",
       &g_InputStream_Constructor);
 
   jobject ret =
     env->NewObject(g_InputStream_clazz,
       method_id);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 // Step 3: RegisterNatives.
@@ skipping 209 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()