diff options
| author | Ian Rogers <irogers@google.com> | 2014-12-02 15:04:37 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-12-02 15:12:27 -0800 |
| commit | 08f1f50d6c2e8f247b8f5f19711d75a792851c7a (patch) | |
| tree | dca490545d56168f7f9ae4a4616199b1b1c8ba0c /runtime/proxy_test.cc | |
| parent | 8443637f71a777a13317fe7635028d758a0adf97 (diff) | |
| download | art-08f1f50d6c2e8f247b8f5f19711d75a792851c7a.zip art-08f1f50d6c2e8f247b8f5f19711d75a792851c7a.tar.gz art-08f1f50d6c2e8f247b8f5f19711d75a792851c7a.tar.bz2 | |
Remove FieldHelper.
Change-Id: I2d74e2d5b3c35a691c95339de0db9361847fca11
Diffstat (limited to 'runtime/proxy_test.cc')
| -rw-r--r-- | runtime/proxy_test.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/runtime/proxy_test.cc b/runtime/proxy_test.cc index 1eded62..3260992 100644 --- a/runtime/proxy_test.cc +++ b/runtime/proxy_test.cc @@ -18,7 +18,6 @@ #include <vector> #include "common_compiler_test.h" -#include "field_helper.h" #include "mirror/art_field-inl.h" #include "scoped_thread_state_change.h" @@ -184,21 +183,20 @@ TEST_F(ProxyTest, ProxyFieldHelper) { // Test "Class[] interfaces" field. MutableHandle<mirror::ArtField> fhandle = hs.NewHandle(static_fields->Get(0)); - FieldHelper fh(fhandle); - EXPECT_EQ("interfaces", std::string(fh.GetField()->GetName())); - EXPECT_EQ("[Ljava/lang/Class;", std::string(fh.GetField()->GetTypeDescriptor())); - EXPECT_EQ(interfacesFieldClass.Get(), fh.GetType()); - EXPECT_EQ("L$Proxy1234;", std::string(fh.GetDeclaringClassDescriptor())); - EXPECT_FALSE(fh.GetField()->IsPrimitiveType()); + EXPECT_EQ("interfaces", std::string(fhandle->GetName())); + EXPECT_EQ("[Ljava/lang/Class;", std::string(fhandle->GetTypeDescriptor())); + EXPECT_EQ(interfacesFieldClass.Get(), fhandle->GetType(true)); + std::string temp; + EXPECT_EQ("L$Proxy1234;", std::string(fhandle->GetDeclaringClass()->GetDescriptor(&temp))); + EXPECT_FALSE(fhandle->IsPrimitiveType()); // Test "Class[][] throws" field. fhandle.Assign(static_fields->Get(1)); - FieldHelper fh2(fhandle); - EXPECT_EQ("throws", std::string(fh2.GetField()->GetName())); - EXPECT_EQ("[[Ljava/lang/Class;", std::string(fh2.GetField()->GetTypeDescriptor())); - EXPECT_EQ(throwsFieldClass.Get(), fh2.GetType()); - EXPECT_EQ("L$Proxy1234;", std::string(fh2.GetDeclaringClassDescriptor())); - EXPECT_FALSE(fh2.GetField()->IsPrimitiveType()); + EXPECT_EQ("throws", std::string(fhandle->GetName())); + EXPECT_EQ("[[Ljava/lang/Class;", std::string(fhandle->GetTypeDescriptor())); + EXPECT_EQ(throwsFieldClass.Get(), fhandle->GetType(true)); + EXPECT_EQ("L$Proxy1234;", std::string(fhandle->GetDeclaringClass()->GetDescriptor(&temp))); + EXPECT_FALSE(fhandle->IsPrimitiveType()); } } // namespace art |