Android: improvements to make jni_generator work outside of chromium

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
 file.
 """
 
 import difflib
 import os
 import sys
 import unittest
 import jni_generator
 from jni_generator import CalledByNative, JniParams, NativeMethod, Param
 
 
+SCRIPT_NAME = 'base/android/jni_generator/jni_generator.py'
+
+
+class Options(object):

[rmcilroy, 2013/09/27 13:07:56]

nit - MockOptions? or maybe TestOptions?

[bulach, 2013/09/30 09:04:50]

Done.

+  """The mock options object which is passed to the jni_generator.py script."""
+
+  def __init__(self):
+    self.namespace = None
+    self.script_name = SCRIPT_NAME
+
+
 class TestGenerator(unittest.TestCase):
   def assertObjEquals(self, first, second):
     dict_first = first.__dict__
     dict_second = second.__dict__
     self.assertEquals(dict_first.keys(), dict_second.keys())
     for key, value in dict_first.iteritems():
       if (type(value) is list and len(value) and
           isinstance(type(value[0]), object)):
         self.assertListEquals(value, second.__getattribute__(key))
       else:
@@ skipping 167 matching lines @@
                                    name='beta'),
                              Param(datatype='double',
                                    name='gamma'),
                             ],
                      java_class_name=None,
                      type='method',
                      p0_type='content::DataFetcherImplAndroid'),
     ]
     self.assertListEquals(golden_natives, natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
-                                             natives, [])
+                                             natives, [], Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/TestJni
 
 #ifndef org_chromium_TestJni_JNI
 #define org_chromium_TestJni_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 209 matching lines @@
     """
     natives = jni_generator.ExtractNatives(test_data)
     golden_natives = [
         NativeMethod(return_type='int', static=False,
                      name='Init', params=[],
                      java_class_name='MyInnerClass',
                      type='function')
     ]
     self.assertListEquals(golden_natives, natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
-                                             natives, [])
+                                             natives, [], Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/TestJni
 
 #ifndef org_chromium_TestJni_JNI
 #define org_chromium_TestJni_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 59 matching lines @@
                      name='Init', params=[],
                      java_class_name='MyInnerClass',
                      type='function'),
         NativeMethod(return_type='int', static=False,
                      name='Init', params=[],
                      java_class_name='MyOtherInnerClass',
                      type='function')
     ]
     self.assertListEquals(golden_natives, natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
-                                             natives, [])
+                                             natives, [], Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/TestJni
 
 #ifndef org_chromium_TestJni_JNI
 #define org_chromium_TestJni_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 78 matching lines @@
                      name='Init', params=[],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='int', static=False,
                      name='Init', params=[],
                      java_class_name='MyOtherInnerClass',
                      type='function')
     ]
     self.assertListEquals(golden_natives, natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
-                                             natives, [])
+                                             natives, [], Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/TestJni
 
 #ifndef org_chromium_TestJni_JNI
 #define org_chromium_TestJni_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 360 matching lines @@
             name='getCompressFormatList',
             method_id_var_name='getCompressFormatList',
             java_class_name='',
             params=[],
             env_call=('Void', ''),
             unchecked=False,
         ),
     ]
     self.assertListEquals(golden_called_by_natives, called_by_natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
-                                             [], called_by_natives)
+                                             [], called_by_natives, Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/TestJni
 
 #ifndef org_chromium_TestJni_JNI
 #define org_chromium_TestJni_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 521 matching lines @@
                    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();
 }
 """
-    jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'), None)
+    jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'), Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     java/util/HashSet
 
 #ifndef java_util_HashSet_JNI
 #define java_util_HashSet_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 59 matching lines @@
     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;
 }
 """
-    jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'), None)
+    jni_from_javap = jni_generator.JNIFromJavaP(contents.split('\n'), Options())
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     java/io/InputStream
 
 #ifndef java_io_InputStream_JNI
 #define java_io_InputStream_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 285 matching lines @@
     public void destroy() {
         Log.v(TAG, "Destroying native SyncSetupFlow");
         if (mNativeSyncSetupFlow != 0) {
             nativeSyncSetupEnded(mNativeSyncSetupFlow);
             mNativeSyncSetupFlow = 0;
         }
     }
     private native void nativeSyncSetupEnded(
         int nativeAndroidSyncSetupFlowHandler);
     """
-    jni_from_java = jni_generator.JNIFromJavaSource(test_data, 'foo/bar')
+    jni_from_java = jni_generator.JNIFromJavaSource(
+        test_data, 'foo/bar', Options())
 
   def testRaisesOnNonJNIMethod(self):
     test_data = """
     class MyInnerClass {
       private int Foo(int p0) {
       }
     }
     """
     self.assertRaises(SyntaxError,
                       jni_generator.JNIFromJavaSource,
-                      test_data, 'foo/bar')
+                      test_data, 'foo/bar', Options())
 
   def testJniSelfDocumentingExample(self):
     script_dir = os.path.dirname(sys.argv[0])
     content = file(os.path.join(script_dir,
         'java/src/org/chromium/example/jni_generator/SampleForTests.java')
         ).read()
     golden_content = file(os.path.join(script_dir,
                                        'golden_sample_for_tests_jni.h')).read()
     jni_from_java = jni_generator.JNIFromJavaSource(
-        content, 'org/chromium/example/jni_generator/SampleForTests')
+        content, 'org/chromium/example/jni_generator/SampleForTests', Options())
     self.assertTextEquals(golden_content, jni_from_java.GetContent())
 
   def testNoWrappingPreprocessorLines(self):
     test_data = """
     package com.google.lookhowextremelylongiam.snarf.icankeepthisupallday;
 
     class ReallyLongClassNamesAreAllTheRage {
         private static native int nativeTest();
     }
     """
     jni_from_java = jni_generator.JNIFromJavaSource(
         test_data, ('com/google/lookhowextremelylongiam/snarf/'
-                    'icankeepthisupallday/ReallyLongClassNamesAreAllTheRage'))
+                    'icankeepthisupallday/ReallyLongClassNamesAreAllTheRage'),
+        Options())
     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 testJarJarRemapping(self):
     test_data = """
     package org.chromium.example.jni_generator;
 
     import org.chromium.example2.Test;
 
     class Example {
       private static native void nativeTest(Test t);
     }
     """
     jni_generator.JniParams.SetJarJarMappings(
         """rule org.chromium.example.** com.test.@1
         rule org.chromium.example2.** org.test2.@0""")
     jni_from_java = jni_generator.JNIFromJavaSource(
-        test_data, 'org/chromium/example/jni_generator/Example')
+        test_data, 'org/chromium/example/jni_generator/Example', Options())
     jni_generator.JniParams.SetJarJarMappings('')
     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.
 
 // This file is autogenerated by
-//     base/android/jni_generator/jni_generator_tests.py
+//     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/example/jni_generator/Example
 
 #ifndef org_chromium_example_jni_generator_Example_JNI
 #define org_chromium_example_jni_generator_Example_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 102 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()