diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-02-24 23:23:58 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-02-26 13:17:44 -0800 |
| commit | a1ce1fef2d49d1d537776a5308ace7102a815fe5 (patch) | |
| tree | a1afe850d9ebd21f4b751eb68e1ec3dc60dab001 /runtime/jni_internal_test.cc | |
| parent | 930f7b843ddc6e6530439d3fdb0e2133a6292f1e (diff) | |
| download | art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.gz art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.bz2 art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.zip | |
Split up CommonTest into CommonRuntimeTest and CommonCompilerTest
Change-Id: I8dcf6b29a5aecd445f1a3ddb06386cf81dbc9c70
Diffstat (limited to 'runtime/jni_internal_test.cc')
| -rw-r--r-- | runtime/jni_internal_test.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc index 63bc45cbd2..28408d25cf 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 @@ class JniInternalTest : public CommonTest { virtual void TearDown() { CleanUpJniEnv(); - CommonTest::TearDown(); + CommonCompilerTest::TearDown(); } jclass GetPrimitiveClass(char descriptor) { @@ -2070,7 +2071,7 @@ TEST_F(JniInternalTest, DetachCurrentThread) { 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 |