PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Infrastructure for showing instant app metadata in app header"

Browse Source
This commit is contained in:
Antony Sargent
2017-02-09 18:02:37 +00:00
committed by Android (Google) Code Review
parent 9ae1b8b046 f3ddd87c7a
commit 3fca717d3b
5 changed files with 400 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications;
import android.annotation.IdRes;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
@@ -24,15 +25,19 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.InstantDataBuilder.Param;
import com.android.settings.applications.instantapps.InstantAppDetails;
import com.android.settingslib.applications.ApplicationsState;
import org.junit.Before;
@@ -51,6 +56,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.EnumSet;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppHeaderControllerTest {
@@ -243,4 +250,103 @@ public class AppHeaderControllerTest {
assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
.isEqualTo(View.GONE);
}
// Ensure that no instant app related information shows up when the AppHeaderController's
// InstantAppDetails are null.
@Test
public void instantApps_nullInstantAppDetails() {
final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, appHeader);
mController.setInstantAppDetails(null);
mController.done();
assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
.isEqualTo(View.GONE);
assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
.isEqualTo(View.GONE);
assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
.isEqualTo(View.GONE);
}
// Ensure that no instant app related information shows up when the AppHeaderController has
// a non-null InstantAppDetails, but each member of it is null.
@Test
public void instantApps_detailsMembersNull() {
final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, appHeader);
InstantAppDetails details = InstantDataBuilder.build(mContext, EnumSet.noneOf(Param.class));
mController.setInstantAppDetails(details);
mController.done();
assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
.isEqualTo(View.GONE);
assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
.isEqualTo(View.GONE);
assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
.isEqualTo(View.GONE);
}
// Helper to assert a TextView for a given id is visible and has a certain string value.
private void assertVisibleContent(View header, @IdRes int id, String expectedValue) {
TextView view = (TextView)header.findViewById(id);
assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(view.getText()).isEqualTo(expectedValue);
}
// Helper to assert an ImageView for a given id is visible and has a certain Drawable value.
private void assertVisibleContent(View header, @IdRes int id, Drawable expectedValue) {
ImageView view = (ImageView)header.findViewById(id);
assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(view.getDrawable()).isEqualTo(expectedValue);
}
// Test that expected items are present in the header when we have a complete InstantAppDetails.
@Test
public void instantApps_expectedHeaderItems() {
final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, header);
InstantAppDetails details = InstantDataBuilder.build(mContext);
mController.setInstantAppDetails(details);
mController.done();
assertVisibleContent(header, R.id.instant_app_developer_title, details.developerTitle);
assertVisibleContent(header, R.id.instant_app_maturity_icon,
details.maturityRatingIcon);
assertVisibleContent(header, R.id.instant_app_maturity_text,
details.maturityRatingString);
assertVisibleContent(header, R.id.instant_app_monetization,
details.monetizationNotice);
}
// Test having each member of InstantAppDetails be null.
@Test
public void instantApps_expectedHeaderItemsWithSingleNullMembers() {
final EnumSet<Param> allParams = EnumSet.allOf(Param.class);
for (Param paramToRemove : allParams) {
EnumSet<Param> params = allParams.clone();
params.remove(paramToRemove);
final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, header);
InstantAppDetails details = InstantDataBuilder.build(mContext, params);
mController.setInstantAppDetails(details);
mController.done();
if (params.contains(Param.DEVELOPER_TITLE)) {
assertVisibleContent(header, R.id.instant_app_developer_title,
details.developerTitle);
}
if (params.contains(Param.MATURITY_RATING_ICON)) {
assertVisibleContent(header, R.id.instant_app_maturity_icon,
details.maturityRatingIcon);
}
if (params.contains(Param.MATURITY_RATING_STRING)) {
assertVisibleContent(header, R.id.instant_app_maturity_text,
details.maturityRatingString);
}
if (params.contains(Param.MONETIZATION_NOTICE)) {
assertVisibleContent(header, R.id.instant_app_monetization,
details.monetizationNotice);
}
}
}
}

118
tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java Normal file
View File

@@ -0,0 +1,118 @@
/**
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package com.android.settings.applications;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.applications.instantapps.InstantAppDetails;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.EnumSet;
/**
* Utility class for generating fake InstantAppDetails data to use in tests.
*/
public class InstantDataBuilder {
public enum Param {
MATURITY_RATING_ICON,
MATURITY_RATING_STRING,
MONETIZATION_NOTICE,
DEVELOPER_TITLE,
PRIVACY_POLICY,
DEVELOPER_WEBSITE,
DEVELOPER_EMAIL,
DEVELOPER_MAILING_ADDRESS
}
/**
* Creates an InstantAppDetails with any desired combination of null/non-null members.
*
* @param context An optional context, required only if MATURITY_RATING_ICON is a member of
* params
* @param params Specifies which elements of the returned InstantAppDetails should be non-null
* @return InstantAppDetails
*/
public static InstantAppDetails build(@Nullable Context context, EnumSet<Param> params) {
Drawable ratingIcon = null;
String rating = null;
String monetizationNotice = null;
String developerTitle = null;
URL privacyPolicy = null;
URL developerWebsite = null;
String developerEmail = null;
String developerMailingAddress = null;
if (params.contains(Param.MATURITY_RATING_ICON)) {
ratingIcon = context.getDrawable(R.drawable.ic_android);
}
if (params.contains(Param.MATURITY_RATING_STRING)) {
rating = "everyone";
}
if (params.contains(Param.MONETIZATION_NOTICE)) {
monetizationNotice = "Uses in-app purchases";
}
if (params.contains(Param.DEVELOPER_TITLE)) {
developerTitle = "Instant Apps Inc.";
}
if (params.contains(Param.DEVELOPER_EMAIL)) {
developerEmail = "developer@instant-apps.com";
}
if (params.contains(Param.DEVELOPER_MAILING_ADDRESS)) {
developerMailingAddress = "1 Main Street, Somewhere, CA, 94043";
}
if (params.contains(Param.PRIVACY_POLICY)) {
try {
privacyPolicy = new URL("https://test.com/privacy");
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
}
if (params.contains(Param.DEVELOPER_WEBSITE)) {
try {
developerWebsite = new URL("https://test.com");
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
}
return InstantAppDetails.builder()
.maturityRatingIcon(ratingIcon)
.maturityRatingString(rating)
.monetizationNotice(monetizationNotice)
.developerTitle(developerTitle)
.privacyPolicy(privacyPolicy)
.developerWebsite(developerWebsite)
.developerEmail(developerEmail)
.developerMailingAddress(developerMailingAddress)
.build();
}
/**
* Convenience method to create an InstantAppDetails with all non-null members.
*
* @param context a required Context for loading a test maturity rating icon
* @return InstantAppDetails
*/
public static InstantAppDetails build(Context context) {
return build(context, EnumSet.allOf(Param.class));
}
}