Revert "Simplifying model testing rules"

Revert submission 32704934-model-test-cleanup

Reason for revert: Droidmonitor created revert due to b/406588406. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:32704934-model-test-cleanup

Change-Id: Ieeb7f5b5699afeae27f946f060147bb68afc36e5
This commit is contained in:
Priyanka Advani (xWF) authored and Android (Google) Code Review committed 2025-03-26 16:12:16 -07:00
1 parent cb84230913
commit 35b6d322ab
46 files changed
+744 -584

No files matched your search

@@ -29,8 +29,6 @@ import android.os.Process;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.model.BgDataModel.Callbacks;
import com.android.launcher3.model.data.AppInfo;
import com.android.launcher3.model.data.ItemInfo;
@@ -38,14 +36,13 @@ import com.android.launcher3.util.Executors;
import com.android.launcher3.util.IntArray;
import com.android.launcher3.util.IntSet;
import com.android.launcher3.util.LauncherLayoutBuilder;
import com.android.launcher3.util.LauncherModelHelper;
import com.android.launcher3.util.PackageUserKey;
import com.android.launcher3.util.RunnableList;
import com.android.launcher3.util.SandboxApplication;
import com.android.launcher3.util.TestUtil;
import com.android.launcher3.util.rule.LayoutProviderRule;
import org.junit.After;
import org.junit.Rule;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,16 +60,21 @@ import java.util.stream.Collectors;
@RunWith(AndroidJUnit4.class)
public class ModelMultiCallbacksTest {
@Rule public SandboxApplication mContext = new SandboxApplication().withModelDependency();
@Rule public LayoutProviderRule mLayoutProvider = new LayoutProviderRule(mContext);
private LauncherModelHelper mModelHelper;
@Before
public void setUp() {
mModelHelper = new LauncherModelHelper();
}
@After
public void tearDown() throws Exception {
mModelHelper.destroy();
TestUtil.uninstallDummyApp();
}
private ModelLauncherCallbacks getCallbacks() {
return getModel().newModelCallbacks();
return mModelHelper.getModel().newModelCallbacks();
}
@Test
@@ -80,7 +82,7 @@ public class ModelMultiCallbacksTest {
setupWorkspacePages(3);
MyCallbacks cb1 = spy(MyCallbacks.class);
Executors.MAIN_EXECUTOR.execute(() -> getModel().addCallbacksAndLoad(cb1));
Executors.MAIN_EXECUTOR.execute(() -> mModelHelper.getModel().addCallbacksAndLoad(cb1));
waitForLoaderAndTempMainThread();
cb1.verifySynchronouslyBound(3);
@@ -89,7 +91,7 @@ public class ModelMultiCallbacksTest {
cb1.reset();
MyCallbacks cb2 = spy(MyCallbacks.class);
cb2.mPageToBindSync = IntSet.wrap(2);
Executors.MAIN_EXECUTOR.execute(() -> getModel().addCallbacksAndLoad(cb2));
Executors.MAIN_EXECUTOR.execute(() -> mModelHelper.getModel().addCallbacksAndLoad(cb2));
waitForLoaderAndTempMainThread();
assertFalse(cb1.bindStarted);
@@ -100,13 +102,13 @@ public class ModelMultiCallbacksTest {
cb2.reset();
// No effect on callbacks when removing an callback
Executors.MAIN_EXECUTOR.execute(() -> getModel().removeCallbacks(cb2));
Executors.MAIN_EXECUTOR.execute(() -> mModelHelper.getModel().removeCallbacks(cb2));
waitForLoaderAndTempMainThread();
assertNull(cb1.mPendingTasks);
assertNull(cb2.mPendingTasks);
// Reloading only loads registered callbacks
getModel().startLoader();
mModelHelper.getModel().startLoader();
waitForLoaderAndTempMainThread();
cb1.verifySynchronouslyBound(3);
assertNull(cb2.mPendingTasks);
@@ -120,8 +122,8 @@ public class ModelMultiCallbacksTest {
MyCallbacks cb1 = spy(MyCallbacks.class);
MyCallbacks cb2 = spy(MyCallbacks.class);
Executors.MAIN_EXECUTOR.execute(() -> getModel().addCallbacksAndLoad(cb1));
Executors.MAIN_EXECUTOR.execute(() -> getModel().addCallbacksAndLoad(cb2));
Executors.MAIN_EXECUTOR.execute(() -> mModelHelper.getModel().addCallbacksAndLoad(cb1));
Executors.MAIN_EXECUTOR.execute(() -> mModelHelper.getModel().addCallbacksAndLoad(cb2));
waitForLoaderAndTempMainThread();
assertTrue(cb1.allApps().contains(TEST_PACKAGE));
@@ -142,7 +144,7 @@ public class ModelMultiCallbacksTest {
assertFalse(cb2.allApps().contains(TestUtil.DUMMY_PACKAGE));
// Unregister a callback and verify updates no longer received
Executors.MAIN_EXECUTOR.execute(() -> getModel().removeCallbacks(cb2));
Executors.MAIN_EXECUTOR.execute(() -> mModelHelper.getModel().removeCallbacks(cb2));
TestUtil.installDummyApp();
getCallbacks().onPackageAdded(TestUtil.DUMMY_PACKAGE, Process.myUserHandle());
waitForLoaderAndTempMainThread();
@@ -164,11 +166,7 @@ public class ModelMultiCallbacksTest {
for (int i = 0; i < pageCount; i++) {
builder.atWorkspace(1, 1, i).putApp(TEST_PACKAGE, TEST_PACKAGE);
}
mLayoutProvider.setupDefaultLayoutProvider(builder);
}
private LauncherModel getModel() {
return LauncherAppState.getInstance(mContext).getModel();
mModelHelper.setupDefaultLayoutProvider(builder);
}
private abstract static class MyCallbacks implements Callbacks {