commit 74eb46ab15c5b9cb39bf15246db84aea7fd4cc27
author Brian Carlstrom <bdc@google.com> Tue Aug 02 20:10:14 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Aug 04 14:36:48 2011 -0700
tree 50727b6606dcf881e0b9e734876815f28e9753c6
parent 419ec7bbcdbf56a9d2a9fd7f91f9ace279e0b664

Improved ClassLoader support

Change-Id: I587c0fa439c64a0c947641b01c072149f480bf85

src/jni_compiler_test.cc

diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc
index 3041927..79806f6 100644
--- a/src/jni_compiler_test.cc
+++ b/src/jni_compiler_test.cc
@@ -204,9 +204,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunNoArgMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod("foo", "()V");
@@ -233,9 +233,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunIntMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod("fooI", "(I)I");
@@ -264,9 +264,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunIntIntMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod("fooII", "(II)I");
@@ -298,9 +298,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunDoubleDoubleMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod("fooDD", "(DD)D");
@@ -331,9 +331,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunIntObjectObjectMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod(
@@ -392,9 +392,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunStaticIntObjectObjectMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindDirectMethod(
@@ -450,9 +450,9 @@
 
 TEST_F(JniCompilerTest, CompileAndRunStaticSynchronizedIntObjectObjectMethod) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindDirectMethod(
@@ -514,9 +514,9 @@
 }
 TEST_F(JniCompilerTest, SuspendCountAcknolewdgement) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod("fooI", "(I)I");
@@ -559,9 +559,9 @@
 }
 TEST_F(JniCompilerTest, ExceptionHandling) {
   scoped_ptr<DexFile> dex(OpenDexFileBase64(kMyClassNativesDex));
-  class_linker_->RegisterDexFile(dex.get());
+  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
 
-  Class* klass = class_linker_->FindClass("LMyClass;", NULL, dex.get());
+  Class* klass = class_linker_->FindClass("LMyClass;", class_loader);
   ASSERT_TRUE(klass != NULL);
 
   Method* method = klass->FindVirtualMethod("foo", "()V");