Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ModuleInfoProviderTest by passing correct flag" into qt-dev

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2020-01-14 16:02:43 +00:00
committed by Android (Google) Code Review
parent c64d1c4649 3dd716a130
commit 5d612f02b8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/tests/servicestests/src/com/android/server/pm/ModuleInfoProviderTest.java
View File

@@ -17,6 +17,7 @@ package com.android.server.pm;
import android.content.Context; import android.content.Context;
import android.content.pm.ModuleInfo; import android.content.pm.ModuleInfo;
import android.content.pm.PackageManager;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import com.android.frameworks.servicestests.R; import com.android.frameworks.servicestests.R;
@@ -28,7 +29,7 @@ public class ModuleInfoProviderTest extends InstrumentationTestCase {
public void testSuccessfulParse() { public void testSuccessfulParse() {
ModuleInfoProvider provider = getProvider(R.xml.well_formed_metadata); ModuleInfoProvider provider = getProvider(R.xml.well_formed_metadata);
List<ModuleInfo> mi = provider.getInstalledModules(0); List<ModuleInfo> mi = provider.getInstalledModules(PackageManager.MATCH_ALL);
assertEquals(2, mi.size()); assertEquals(2, mi.size());
Collections.sort(mi, (ModuleInfo m1, ModuleInfo m2) -> Collections.sort(mi, (ModuleInfo m1, ModuleInfo m2) ->
@@ -49,18 +50,18 @@ public class ModuleInfoProviderTest extends InstrumentationTestCase {
public void testParseFailure_incorrectTopLevelElement() { public void testParseFailure_incorrectTopLevelElement() {
ModuleInfoProvider provider = getProvider(R.xml.unparseable_metadata1); ModuleInfoProvider provider = getProvider(R.xml.unparseable_metadata1);
assertEquals(0, provider.getInstalledModules(0).size()); assertEquals(0, provider.getInstalledModules(PackageManager.MATCH_ALL).size());
} }
public void testParseFailure_incorrectModuleElement() { public void testParseFailure_incorrectModuleElement() {
ModuleInfoProvider provider = getProvider(R.xml.unparseable_metadata2); ModuleInfoProvider provider = getProvider(R.xml.unparseable_metadata2);
assertEquals(0, provider.getInstalledModules(0).size()); assertEquals(0, provider.getInstalledModules(PackageManager.MATCH_ALL).size());
} }
public void testParse_unknownAttributesIgnored() { public void testParse_unknownAttributesIgnored() {
ModuleInfoProvider provider = getProvider(R.xml.well_formed_metadata); ModuleInfoProvider provider = getProvider(R.xml.well_formed_metadata);
List<ModuleInfo> mi = provider.getInstalledModules(0); List<ModuleInfo> mi = provider.getInstalledModules(PackageManager.MATCH_ALL);
assertEquals(2, mi.size()); assertEquals(2, mi.size());
ModuleInfo mi1 = provider.getModuleInfo("com.android.module1", 0); ModuleInfo mi1 = provider.getModuleInfo("com.android.module1", 0);