Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6bab556 authored by Sebastián Franco's avatar Sebastián Franco Committed by Android (Google) Code Review
Browse files

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

parents 7a9923c2 458de205

tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+5 −7
Original line number Diff line number Diff line
@@ -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. */

tests/src/com/android/launcher3/allapps/TaplAllAppsIconsWorkingTest.java

+0 −2
Original line number Diff line number Diff line
@@ -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;

tests/src/com/android/launcher3/allapps/TaplKeyboardFocusTest.java

+0 −1
Original line number Diff line number Diff line
@@ -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;

tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java

+0 −1
Original line number Diff line number Diff line
@@ -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;

tests/src/com/android/launcher3/dragging/TaplDragTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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",