openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fixing overview package name chech in TAPL" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2018-10-11 21:33:16 +00:00 committed by Android (Google) Code Review
parent e0c16831a8 897931a56a
commit 7fad0d54ca
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/tapl/com/android/launcher3/tapl/Background.java
View File

@ -17,11 +17,10 @@
package com.android.launcher3.tapl;
import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS;
import static com.android.launcher3.tapl.TestHelpers.getOverviewPackageName;
import static org.junit.Assert.assertTrue;
import static androidx.test.InstrumentationRegistry.getTargetContext;
import androidx.annotation.NonNull;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.UiObject2;
@ -52,9 +51,8 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
public BaseOverview switchToOverview() {
verifyActiveContainer();
goToOverviewUnchecked();
assertTrue("Overview not visible", mLauncher.getDevice().wait(Until.hasObject(By.pkg(
getTargetContext().getPackageName())),
WAIT_TIME_MS));
assertTrue("Overview not visible", mLauncher.getDevice().wait(
Until.hasObject(By.pkg(getOverviewPackageName())), WAIT_TIME_MS));
return new BaseOverview(mLauncher);
}

2
tests/tapl/com/android/launcher3/tapl/BaseOverview.java
View File

@ -16,8 +16,6 @@
package com.android.launcher3.tapl;
import com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
import java.util.Collections;
import java.util.List;

11
tests/tapl/com/android/launcher3/tapl/TestHelpers.java
View File

@ -20,10 +20,12 @@ import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static androidx.test.InstrumentationRegistry.getTargetContext;
import android.app.Instrumentation;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import java.util.List;
@ -70,4 +72,13 @@ public class TestHelpers {
}
return launchers.get(0).activityInfo;
}
public static String getOverviewPackageName() {
Resources res = Resources.getSystem();
int id = res.getIdentifier("config_recentsComponentName", "string", "android");
if (id != 0) {
return ComponentName.unflattenFromString(res.getString(id)).getPackageName();
}
return "com.android.systemui";
}
}