commit 4665167ddc34008dfa78a2873685fe7a98772eab
author Andreas Gampe <agampe@google.com> Fri Apr 07 09:00:04 2017 -0700
committer Andreas Gampe <agampe@google.com> Fri Apr 07 09:44:55 2017 -0700
tree 9af21169db0e6de2496b2946861436a9ecaf72e3
parent 2bbf16da51c6a61da8ccd3c8d4d8382f6bbc9623

ART: More refactor for JVMTI run tests (1/3)

Put (most) tests into a new package and give them dedicated
class names (Test9XY).

NOTE: BROKEN WITHOUT A FOLLOW-UP CL TO CHANGE DIRECTORY STRUCTURE
      AND FILE NAMES!

Bug: 32072923
Test: None
Change-Id: I291b0543f7782914e446a74f0d9037020c88e5b5

test/906-iterate-heap/iterate_heap.cc

diff --git a/test/906-iterate-heap/iterate_heap.cc b/test/906-iterate-heap/iterate_heap.cc
index bb30074..6534b4c 100644
--- a/test/906-iterate-heap/iterate_heap.cc
+++ b/test/906-iterate-heap/iterate_heap.cc
@@ -71,11 +71,12 @@
   return true;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_Main_iterateThroughHeapCount(JNIEnv* env,
-                                                                    jclass klass ATTRIBUTE_UNUSED,
-                                                                    jint heap_filter,
-                                                                    jclass klass_filter,
-                                                                    jint stop_after) {
+extern "C" JNIEXPORT jint JNICALL Java_art_Test906_iterateThroughHeapCount(
+    JNIEnv* env,
+    jclass klass ATTRIBUTE_UNUSED,
+    jint heap_filter,
+    jclass klass_filter,
+    jint stop_after) {
   class CountIterationConfig : public IterationConfig {
    public:
     CountIterationConfig(jint _counter, jint _stop_after)
@@ -108,15 +109,15 @@
   return config.counter;
 }
 
-
-extern "C" JNIEXPORT jint JNICALL Java_Main_iterateThroughHeapData(JNIEnv* env,
-                                                                   jclass klass ATTRIBUTE_UNUSED,
-                                                                   jint heap_filter,
-                                                                   jclass klass_filter,
-                                                                   jlongArray class_tags,
-                                                                   jlongArray sizes,
-                                                                   jlongArray tags,
-                                                                   jintArray lengths) {
+extern "C" JNIEXPORT jint JNICALL Java_art_Test906_iterateThroughHeapData(
+    JNIEnv* env,
+    jclass klass ATTRIBUTE_UNUSED,
+    jint heap_filter,
+    jclass klass_filter,
+    jlongArray class_tags,
+    jlongArray sizes,
+    jlongArray tags,
+    jintArray lengths) {
   class DataIterationConfig : public IterationConfig {
    public:
     jint Handle(jlong class_tag, jlong size, jlong* tag_ptr, jint length) OVERRIDE {
@@ -154,10 +155,8 @@
   return static_cast<jint>(config.class_tags_.size());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_Main_iterateThroughHeapAdd(JNIEnv* env,
-                                                                  jclass klass ATTRIBUTE_UNUSED,
-                                                                  jint heap_filter,
-                                                                  jclass klass_filter) {
+extern "C" JNIEXPORT void JNICALL Java_art_Test906_iterateThroughHeapAdd(
+    JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jint heap_filter, jclass klass_filter) {
   class AddIterationConfig : public IterationConfig {
    public:
     AddIterationConfig() {}
@@ -178,7 +177,7 @@
   Run(env, heap_filter, klass_filter, &config);
 }
 
-extern "C" JNIEXPORT jstring JNICALL Java_Main_iterateThroughHeapString(
+extern "C" JNIEXPORT jstring JNICALL Java_art_Test906_iterateThroughHeapString(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jlong tag) {
   struct FindStringCallbacks {
     explicit FindStringCallbacks(jlong t) : tag_to_find(t) {}
@@ -234,7 +233,7 @@
   return env->NewStringUTF(fsc.data.c_str());
 }
 
-extern "C" JNIEXPORT jstring JNICALL Java_Main_iterateThroughHeapPrimitiveArray(
+extern "C" JNIEXPORT jstring JNICALL Java_art_Test906_iterateThroughHeapPrimitiveArray(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jlong tag) {
   struct FindArrayCallbacks {
     explicit FindArrayCallbacks(jlong t) : tag_to_find(t) {}
@@ -345,7 +344,7 @@
   UNREACHABLE();
 }
 
-extern "C" JNIEXPORT jstring JNICALL Java_Main_iterateThroughHeapPrimitiveFields(
+extern "C" JNIEXPORT jstring JNICALL Java_art_Test906_iterateThroughHeapPrimitiveFields(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jlong tag) {
   struct FindFieldCallbacks {
     explicit FindFieldCallbacks(jlong t) : tag_to_find(t) {}