Use new JUnit based test framework

Bug: 18547020

Change-Id: I5d02ebdecbf79bea035ae8a042d50a06aa7c2a62

3 files changed, 52 insertions, 3 deletions

diff --git a/jack-tests/tests/com/android/jack/order/OrderTests.java b/jack-tests/tests/com/android/jack/order/OrderTests.java
new file mode 100644
index 0000000..c62c800
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/order/OrderTests.java
@@ -0,0 +1,49 @@
+/*
+* Copyright (C) 2014 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.android.jack.order;
+
+import com.android.jack.test.category.RuntimeRegressionTest;
+import com.android.jack.test.helper.RuntimeTestHelper;
+import com.android.jack.test.runtime.RuntimeTest;
+import com.android.jack.test.runtime.RuntimeTestInfo;
+import com.android.jack.test.toolchain.AbstractTestTools;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+public class OrderTests extends RuntimeTest {
+
+  private RuntimeTestInfo TEST001 = new RuntimeTestInfo(
+    AbstractTestTools.getTestRootDir("com.android.jack.order.test001"),
+    "com.android.jack.order.test001.dx.Tests");
+
+  @BeforeClass
+  public static void setUpClass() {
+    OrderTests.class.getClassLoader().setDefaultAssertionStatus(true);
+  }
+  @Test
+  @Category(RuntimeRegressionTest.class)
+  public void test001() throws Exception {
+    new RuntimeTestHelper(TEST001).compileAndRunTest();
+  }
+
+  @Override
+  protected void fillRtTestInfos() {
+    rtTestInfos.add(TEST001);
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/order/dx/Tests.java b/jack-tests/tests/com/android/jack/order/test001/dx/Tests.java
index 4c2243b..9d27267 100644
--- a/jack-tests/tests/com/android/jack/order/dx/Tests.java
+++ b/jack-tests/tests/com/android/jack/order/test001/dx/Tests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.jack.order.dx;
+package com.android.jack.order.test001.dx;
 
-import com.android.jack.order.jack.Order;
+import com.android.jack.order.test001.jack.Order;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/jack-tests/tests/com/android/jack/order/jack/Order.java b/jack-tests/tests/com/android/jack/order/test001/jack/Order.java
index 47ee620..770f9f9 100644
--- a/jack-tests/tests/com/android/jack/order/jack/Order.java
+++ b/jack-tests/tests/com/android/jack/order/test001/jack/Order.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.order.jack;
+package com.android.jack.order.test001.jack;
 
 /**
  * Evaluation order test.