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

Merge "Remove old format contextual card log" into qt-dev am: cc0cec4636

Browse Source 
am: c82c5ebfe6

Change-Id: Ic4f07000baaa07add48b4a673ebdb6430222ae8f
This commit is contained in:
Raff Tsai
2019-04-11 00:25:30 -07:00
committed by android-build-merger
parent 48a7fddf0e c82c5ebfe6
commit c52f3117f3
6 changed files with 2 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/res/values-mcc999/config.xml
View File

@@ -78,11 +78,6 @@
<item>fake_package/fake_service</item>
</string-array>
<!-- Settings intelligence interaction log intent action -->
<string name="config_settingsintelligence_log_action" translatable="false">
aaa.bbb.ccc
</string>
<!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
<string-array name="slice_whitelist_package_names" translatable="false">
<item>com.android.settings.slice_whitelist_package</item>

102
tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java
View File

@@ -1,102 +0,0 @@
/*
* Copyright (C) 2018 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.homepage.contextualcards;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.UserHandle;
import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class ContextualCardFeatureProviderImplTest {
private Context mContext;
private ContextualCardFeatureProviderImpl mImpl;
@Before
public void setUp() {
mContext = spy(RuntimeEnvironment.application);
mImpl = new ContextualCardFeatureProviderImpl(mContext);
}
@Test
public void sendBroadcast_emptyAction_notSendBroadcast() {
final Intent intent = new Intent();
mImpl.sendBroadcast(intent);
verify(mContext, never()).sendBroadcastAsUser(intent, UserHandle.CURRENT);
}
@Test
@Config(qualifiers = "mcc999")
public void sendBroadcast_hasAction_sendBroadcast() {
final Intent intent = new Intent();
mImpl.sendBroadcast(intent);
verify(mContext).sendBroadcastAsUser(intent, UserHandle.CURRENT);
}
@Test
@Config(qualifiers = "mcc999")
public void logContextualCardDisplay_hasAction_sendBroadcast() {
mImpl.logContextualCardDisplay(new ArrayList<>(), new ArrayList<>());
verify(mContext).sendBroadcastAsUser(any(Intent.class), any());
}
@Test
public void serialize_hasSizeTwo_returnSizeTwo() {
final List<ContextualCard> cards = new ArrayList<>();
cards.add(new ContextualCard.Builder()
.setName("name1")
.setSliceUri(Uri.parse("uri1"))
.build());
cards.add(new ContextualCard.Builder()
.setName("name2")
.setSliceUri(Uri.parse("uri2"))
.build());
final byte[] data = mImpl.serialize(cards);
try {
assertThat(ContextualCardList
.parseFrom(data).getCardCount()).isEqualTo(cards.size());
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
}
}
}

4
tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
View File

@@ -197,8 +197,8 @@ public class ContextualCardLoaderTest {
mContextualCardLoader.getDisplayableCards(new ArrayList<>());
verify(mFakeFeatureFactory.mContextualCardFeatureProvider, never())
.logContextualCardDisplay(anyList(), anyList());
verify(mFakeFeatureFactory.metricsFeatureProvider, never()).action(any(),
eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW), any(String.class));
}
private ContextualCard getContextualCard(String sliceUri) {