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

Merge "Changed UserVisibilityMediatorTestCase to use the main handler."

Browse Source
This commit is contained in:
Felipe Leme
2022-11-21 23:02:30 +00:00
committed by Android (Google) Code Review
parent b6f89235d6 d02d2edb77
commit cd6372c1c3
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/mockingservicestests/src/com/android/server/pm/AsyncUserVisibilityListener.java
View File

@@ -40,7 +40,8 @@ public final class AsyncUserVisibilityListener implements UserVisibilityListener
private static final String TAG = AsyncUserVisibilityListener.class.getSimpleName();
private static final long WAIT_TIMEOUT_MS = 2_000;
private static final long WAIT_NO_EVENTS_TIMEOUT_MS = 1_000;
private static final long WAIT_NO_EVENTS_TIMEOUT_MS = 100;
private static int sNextId;

31
services/tests/mockingservicestests/src/com/android/server/pm/UserVisibilityMediatorTestCase.java
View File

@@ -36,16 +36,14 @@ import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;
import android.annotation.UserIdInt;
import android.os.HandlerThread;
import android.os.Handler;
import android.util.IntArray;
import android.util.Log;
import com.android.internal.util.Preconditions;
import com.android.server.ExtendedMockitoTestCase;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import java.util.Arrays;
@@ -103,10 +101,8 @@ abstract class UserVisibilityMediatorTestCase extends ExtendedMockitoTestCase {
protected static final boolean FG = true;
protected static final boolean BG = false;
private static final HandlerThread sHandlerThread = new HandlerThread(TAG);
protected final AsyncUserVisibilityListener.Factory mListenerFactory =
new AsyncUserVisibilityListener.Factory(mExpect, sHandlerThread);
private Handler mHandler;
protected AsyncUserVisibilityListener.Factory mListenerFactory;
private final boolean mUsersOnSecondaryDisplaysEnabled;
@@ -116,24 +112,13 @@ abstract class UserVisibilityMediatorTestCase extends ExtendedMockitoTestCase {
mUsersOnSecondaryDisplaysEnabled = usersOnSecondaryDisplaysEnabled;
}
@BeforeClass
public static final void startHandlerThread() {
Log.d(TAG, "Starting handler thread " + sHandlerThread);
sHandlerThread.start();
}
@AfterClass
public static final void quitHandlerThread() {
Log.d(TAG, "Quitting handler thread " + sHandlerThread);
if (!sHandlerThread.quit()) {
Log.w(TAG, "sHandlerThread(" + sHandlerThread + ").quit() returned false");
}
}
@Before
public final void setFixtures() {
mMediator = new UserVisibilityMediator(mUsersOnSecondaryDisplaysEnabled,
sHandlerThread.getThreadHandler());
mHandler = Handler.getMain();
Thread thread = mHandler.getLooper().getThread();
Log.i(TAG, "setFixtures(): using thread " + thread + " (from handler " + mHandler + ")");
mListenerFactory = new AsyncUserVisibilityListener.Factory(mExpect, thread);
mMediator = new UserVisibilityMediator(mUsersOnSecondaryDisplaysEnabled, mHandler);
mDumpableDumperRule.addDumpable(mMediator);
}