Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory.

Change-Id: Ifa0f14aad3fee7cad47cdf762c6cff457b56a473

2 files changed, 17 insertions, 8 deletions

diff --git a/core/tests/coretests/src/android/os/AsyncChannelTest.java b/core/tests/coretests/src/com/android/internal/util/AsyncChannelTest.java
index 43c8290..7088650 100644
--- a/core/tests/coretests/src/android/os/AsyncChannelTest.java
+++ b/core/tests/coretests/src/com/android/internal/util/AsyncChannelTest.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package android.os;
+package com.android.internal.util;
 
+import android.os.Debug;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
@@ -26,13 +27,17 @@ import junit.framework.TestCase;
  */
 public class AsyncChannelTest extends TestCase {
     private static final boolean DBG = true;
-    private static final boolean WAIT_FOR_DEBUGGER = true;
+    private static final boolean WAIT_FOR_DEBUGGER = false;
     private static final String TAG = "AsyncChannelTest";
 
     @SmallTest
     public void test1() throws Exception {
+        if (DBG) log("test1");
         if (WAIT_FOR_DEBUGGER) Debug.waitForDebugger();
-        Log.d(TAG, "test1");
         assertTrue(1 == 1);
     }
+
+    protected void log(String s) {
+        Log.d(TAG, s);
+    }
 }
diff --git a/core/tests/coretests/src/android/os/HierarchicalStateMachineTest.java b/core/tests/coretests/src/com/android/internal/util/HierarchicalStateMachineTest.java
index 6820987..36666c4 100644
--- a/core/tests/coretests/src/android/os/HierarchicalStateMachineTest.java
+++ b/core/tests/coretests/src/com/android/internal/util/HierarchicalStateMachineTest.java
@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-package android.os;
+package com.android.internal.util;
+
+import android.os.Debug;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.os.SystemClock;
 
 import com.android.internal.util.HierarchicalState;
 import com.android.internal.util.HierarchicalStateMachine;
@@ -28,8 +34,6 @@ import junit.framework.TestCase;
 
 /**
  * Test for HierarchicalStateMachine.
- *
- * @author wink@google.com (Wink Saville)
  */
 public class HierarchicalStateMachineTest extends TestCase {
     private static final int TEST_CMD_1 = 1;
@@ -40,7 +44,7 @@ public class HierarchicalStateMachineTest extends TestCase {
     private static final int TEST_CMD_6 = 6;
 
     private static final boolean DBG = true;
-    private static final boolean WAIT_FOR_DEBUGGER = true;
+    private static final boolean WAIT_FOR_DEBUGGER = false;
     private static final String TAG = "HierarchicalStateMachineTest";
 
     /**
@@ -92,7 +96,7 @@ public class HierarchicalStateMachineTest extends TestCase {
 
     @SmallTest
     public void testStateMachineQuitTest() throws Exception {
-        //if (WAIT_FOR_DEBUGGER) Debug.waitForDebugger();
+        if (WAIT_FOR_DEBUGGER) Debug.waitForDebugger();
 
         StateMachineQuitTest smQuitTest = new StateMachineQuitTest("smQuitTest");
         smQuitTest.start();