diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-11-09 14:11:51 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-11-10 17:09:16 -0800 |
| commit | 53463ea90640c417a6109c7fd987ec3f2e97b52f (patch) | |
| tree | 9c225f1ba59f29bb80e6bd1e4581173eb3bb4a23 /runtime/dex_method_iterator_test.cc | |
| parent | fa7ec00ae4f9f8b1c8e1ad809155cfa675a0121d (diff) | |
| download | art-53463ea90640c417a6109c7fd987ec3f2e97b52f.tar.gz art-53463ea90640c417a6109c7fd987ec3f2e97b52f.tar.bz2 art-53463ea90640c417a6109c7fd987ec3f2e97b52f.zip | |
Use CommonRuntimeTest::boot_class_path_ in DexMethodIteratorTest
In addition, remove some other unnecessary dependencies.
Change-Id: I5ec97b54c3c064ea98feb70dbfd226118ec98290
Diffstat (limited to 'runtime/dex_method_iterator_test.cc')
| -rw-r--r-- | runtime/dex_method_iterator_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/dex_method_iterator_test.cc b/runtime/dex_method_iterator_test.cc index c6f333f675..2681ad0411 100644 --- a/runtime/dex_method_iterator_test.cc +++ b/runtime/dex_method_iterator_test.cc @@ -18,6 +18,7 @@ #include "base/stl_util.h" #include "common_runtime_test.h" +#include "oat_file.h" #include "scoped_thread_state_change.h" #include "thread-inl.h" @@ -29,9 +30,9 @@ class DexMethodIteratorTest : public CommonRuntimeTest { TEST_F(DexMethodIteratorTest, Basic) { ScopedObjectAccess soa(Thread::Current()); std::vector<const DexFile*> dex_files; - const char* jars[] = { "core-libart", "conscrypt", "okhttp", "core-junit", "bouncycastle" }; - for (size_t i = 0; i < 5; ++i) { - dex_files.push_back(LoadExpectSingleDexFile(GetDexFileName(jars[i]).c_str())); + CHECK_NE(boot_class_path_.size(), 0U); + for (size_t i = 0; i < boot_class_path_.size(); ++i) { + dex_files.push_back(boot_class_path_[i]); } DexMethodIterator it(dex_files); while (it.HasNext()) { @@ -43,7 +44,6 @@ TEST_F(DexMethodIteratorTest, Basic) { } it.Next(); } - STLDeleteElements(&dex_files); } } // namespace art |