aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove unnecesary AbstractLauncherUiTest.initialize whit two arguments" into main

Browse Source
This commit is contained in:
Sebastián Franco
2024-02-08 19:33:13 +00:00
committed by Android (Google) Code Review
parent 7a9923c2c7 458de20538
commit e6bab556a1
6 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -83,6 +83,7 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import java.io.IOException;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -223,14 +224,9 @@ public abstract class AbstractLauncherUiTest {
public SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
public static void initialize(AbstractLauncherUiTest test) throws Exception {
initialize(test, false);
}
public static void initialize(
AbstractLauncherUiTest test, boolean clearWorkspace) throws Exception {
test.reinitializeLauncherData(clearWorkspace);
test.reinitializeLauncherData();
test.mDevice.pressHome();
test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);
test.waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
test.waitForState("Launcher internal state didn't switch to Home",
() -> LauncherState.NORMAL);
test.waitForResumed("Launcher internal state is still Background");
@@ -310,6 +306,8 @@ public abstract class AbstractLauncherUiTest {
}
onTestStart();
initialize(this);
}
/** Method that should be called when a test starts. */

2
tests/src/com/android/launcher3/allapps/TaplAllAppsIconsWorkingTest.java
View File

@@ -15,8 +15,6 @@
*/
package com.android.launcher3.allapps;
import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

1
tests/src/com/android/launcher3/allapps/TaplKeyboardFocusTest.java
View File

@@ -15,7 +15,6 @@
*/
package com.android.launcher3.allapps;
import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;
import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;
import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;

1
tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java
View File

@@ -16,7 +16,6 @@
package com.android.launcher3.appiconmenu;
import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME;
import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

2
tests/src/com/android/launcher3/dragging/TaplDragTest.java
View File

@@ -230,7 +230,7 @@ public class TaplDragTest extends AbstractLauncherUiTest {
allApps.unfreeze();
}
// Reset the workspace for the next shortcut creation.
initialize(this, true);
reinitializeLauncherData(true);
endTime = SystemClock.uptimeMillis();
elapsedTime = endTime - startTime;
Log.d("testDragAppIconToWorkspaceCellTime",

1
tests/src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java
View File

@@ -16,7 +16,6 @@
package com.android.launcher3.dragging;
import static com.android.launcher3.testing.shared.TestProtocol.ICON_MISSING;
import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;
import static com.android.launcher3.util.TestConstants.AppNames.DUMMY_APP_NAME;
import static com.android.launcher3.util.TestConstants.AppNames.GMAIL_APP_NAME;
import static com.android.launcher3.util.TestConstants.AppNames.MAPS_APP_NAME;