Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory."

Browse Source
This commit is contained in:
Wink Saville
2010-11-15 13:24:37 -08:00
committed by Android (Google) Code Review
parent 7f7b9fd000 6b888d98f7
commit 47ea7c43da
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/tests/coretests/src/android/os/AsyncChannelTest.java → core/tests/coretests/src/com/android/internal/util/AsyncChannelTest.java
View File

@@ -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);
}
}

14
core/tests/coretests/src/android/os/HierarchicalStateMachineTest.java → core/tests/coretests/src/com/android/internal/util/HierarchicalStateMachineTest.java
View File

@@ -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();