commit a1ce1fef2d49d1d537776a5308ace7102a815fe5
author Brian Carlstrom <bdc@google.com> Mon Feb 24 23:23:58 2014 -0800
committer Brian Carlstrom <bdc@google.com> Wed Feb 26 13:17:44 2014 -0800
tree a1afe850d9ebd21f4b751eb68e1ec3dc60dab001
parent 930f7b843ddc6e6530439d3fdb0e2133a6292f1e

Split up CommonTest into CommonRuntimeTest and CommonCompilerTest

Change-Id: I8dcf6b29a5aecd445f1a3ddb06386cf81dbc9c70

runtime/jni_internal_test.cc

diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc
index 63bc45c..28408d2 100644
--- a/runtime/jni_internal_test.cc
+++ b/runtime/jni_internal_test.cc
@@ -20,7 +20,7 @@
 #include <cfloat>
 #include <cmath>
 
-#include "common_test.h"
+#include "common_compiler_test.h"
 #include "invoke_arg_array_builder.h"
 #include "mirror/art_method-inl.h"
 #include "mirror/class-inl.h"
@@ -31,10 +31,11 @@
 
 namespace art {
 
-class JniInternalTest : public CommonTest {
+// TODO: Convert to CommonRuntimeTest. Currently MakeExecutable is used.
+class JniInternalTest : public CommonCompilerTest {
  protected:
   virtual void SetUp() {
-    CommonTest::SetUp();
+    CommonCompilerTest::SetUp();
 
     vm_ = Runtime::Current()->GetJavaVM();
 
@@ -75,7 +76,7 @@
 
   virtual void TearDown() {
     CleanUpJniEnv();
-    CommonTest::TearDown();
+    CommonCompilerTest::TearDown();
   }
 
   jclass GetPrimitiveClass(char descriptor) {
@@ -2070,7 +2071,7 @@
 
   jint err = vm_->DetachCurrentThread();
   EXPECT_EQ(JNI_ERR, err);
-  vm_->AttachCurrentThread(&env_, NULL);  // need attached thread for CommonTest::TearDown
+  vm_->AttachCurrentThread(&env_, NULL);  // need attached thread for CommonRuntimeTest::TearDown
 }
 
 }  // namespace art