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 1640 matching lines @@
   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;
@@ skipping 500 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()