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/905-object-free/src/Main.java

diff --git a/test/905-object-free/src/Main.java b/test/905-object-free/src/Main.java
index 0d57629..1ed7a0e 100644
--- a/test/905-object-free/src/Main.java
+++ b/test/905-object-free/src/Main.java
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
+package art;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
-public class Main {
-  public static void main(String[] args) throws Exception {
+public class Test905 {
+  public static void run() throws Exception {
+    Main.bindAgentJNIForClass(Test905.class);
     doTest();
   }
 
@@ -67,7 +70,7 @@
 
   private static void stressAllocate(int i) {
     Object obj = new Object();
-    setTag(obj, i);
+    Main.setTag(obj, i);
     setTag2(obj, i + 1);
   }
 
@@ -92,7 +95,7 @@
   private static void allocate(ArrayList<Object> l, long tag) {
     Object obj = new Object();
     l.add(obj);
-    setTag(obj, tag);
+    Main.setTag(obj, tag);
   }
 
   private static void getAndPrintTags() {
@@ -103,7 +106,6 @@
 
   private static native void setupObjectFreeCallback();
   private static native void enableFreeTracking(boolean enable);
-  private static native void setTag(Object o, long tag);
   private static native long[] getCollectedTags(int index);
   private static native void setTag2(Object o, long tag);
 }