修复因com.android.webview在API 19上不存在导致ApplicationInfo测试失败的问题

ckrgithub · Aug 21, 2019 · 035681d · 035681d
1 parent 4e6ffd8
commit 035681d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...ases/plugin_main/application_info/PackageManagerGetOtherInstalledApplicationInfoTest.java b/...ases/plugin_main/application_info/PackageManagerGetOtherInstalledApplicationInfoTest.java
@@ -21,7 +21,7 @@ protected String getTag() {
 
     private ApplicationInfo getApplicationInfoFromHost() throws PackageManager.NameNotFoundException {
         PackageManager packageManager = ApplicationProvider.getApplicationContext().getPackageManager();
-        return packageManager.getApplicationInfo("com.android.webview", GET_META_DATA);
+        return packageManager.getApplicationInfo("com.android.shell", GET_META_DATA);
     }
 
     @Override
@@ -44,7 +44,11 @@ public void testMetaData() {
     @Override
     public void testClassName() throws Exception {
         ApplicationInfo applicationInfoFromHost = getApplicationInfoFromHost();
+        String className = applicationInfoFromHost.className;
+        if (className == null) {
+            className = "";
+        }
         matchTextWithViewTag("TAG_className_" + getTag(),
-                applicationInfoFromHost.className);
+                className);
     }
 }
diff --git a/...ow/test/plugin/general_cases/lib/usecases/application/TestGetApplicationInfoActivity.java b/...ow/test/plugin/general_cases/lib/usecases/application/TestGetApplicationInfoActivity.java
@@ -24,7 +24,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             parseApplicationInfo("PackageManagerGetSelf",
                     getPackageManager().getApplicationInfo(getPackageName(), GET_META_DATA));
             parseApplicationInfo("PackageManagerGetOtherInstalled",
-                    getPackageManager().getApplicationInfo("com.android.webview", GET_META_DATA));
+                    getPackageManager().getApplicationInfo("com.android.shell", GET_META_DATA));
         } catch (PackageManager.NameNotFoundException e) {
             throw new RuntimeException(e);
         }