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

Commit 458de205 authored by Sebastián Franco's avatar Sebastián Franco
Browse files

Remove unnecesary AbstractLauncherUiTest.initialize whit two arguments 

Bug: 324261526
Test: atest TaplDragTest
Flag: NA
Change-Id: I0802d725eea222d19c8d8e60878c2f88be854ddc
parent 3f4401aa

quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.quickstep;



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/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/allapps/TaplOpenCloseAllAppsTest.java

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.launcher3.allapps;



import static com.android.launcher3.util.TestUtil.expectFail;

import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;