Merge "ModuleLicenseProviderTest converted to JUnit"

This commit is contained in:
Jeremy Goldman
2020-12-21 07:38:51 +00:00
committed by Android (Google) Code Review
2 changed files with 25 additions and 21 deletions

View File

@@ -62,7 +62,7 @@ public class ModuleLicenseProvider extends ContentProvider {
@Override
public String getType(Uri uri) {
checkUri(getContext(), uri);
checkUri(getModuleContext(), uri);
return LICENSE_FILE_MIME_TYPE;
}
@@ -83,7 +83,7 @@ public class ModuleLicenseProvider extends ContentProvider {
@Override
public ParcelFileDescriptor openFile(Uri uri, String mode) {
final Context context = getContext();
final Context context = getModuleContext();
checkUri(context, uri);
Preconditions.checkArgument("r".equals(mode), "Read is the only supported mode");
@@ -191,4 +191,10 @@ public class ModuleLicenseProvider extends ContentProvider {
private static SharedPreferences getPrefs(Context context) {
return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
}
// Method to allow context injection for testing purposes.
@VisibleForTesting
protected Context getModuleContext() {
return getContext();
}
}