Merge "Add log feature"
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* 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 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 com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class ContextualCardFeatureProviderImplTest {
|
||||
|
||||
private Context mContext;
|
||||
private ContextualCardFeatureProviderImpl mImpl;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
mImpl = new ContextualCardFeatureProviderImpl();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendBroadcast_emptyAction_notSendBroadcast() {
|
||||
final Intent intent = new Intent();
|
||||
mImpl.sendBroadcast(mContext, intent);
|
||||
|
||||
verify(mContext, never()).sendBroadcast(intent);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = "mcc999")
|
||||
public void sendBroadcast_hasAction_sendBroadcast() {
|
||||
final Intent intent = new Intent();
|
||||
mImpl.sendBroadcast(mContext, intent);
|
||||
|
||||
verify(mContext).sendBroadcast(intent);
|
||||
}
|
||||
}
|
||||
@@ -18,9 +18,10 @@ package com.android.settings.homepage.contextualcards.slices;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.any;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.ContentValues;
|
||||
@@ -33,6 +34,7 @@ import com.android.settings.homepage.contextualcards.CardDatabaseHelper;
|
||||
import com.android.settings.homepage.contextualcards.ContextualCard;
|
||||
import com.android.settings.homepage.contextualcards.ContextualCardFeedbackDialog;
|
||||
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -57,6 +59,7 @@ public class SliceContextualCardControllerTest {
|
||||
private CardContentProvider mProvider;
|
||||
private ContentResolver mResolver;
|
||||
private SliceContextualCardController mController;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -67,6 +70,7 @@ public class SliceContextualCardControllerTest {
|
||||
mProvider);
|
||||
mResolver = mContext.getContentResolver();
|
||||
mController = spy(new SliceContextualCardController(mContext));
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -75,7 +79,8 @@ public class SliceContextualCardControllerTest {
|
||||
mResolver.insert(providerUri, generateOneRow());
|
||||
doNothing().when(mController).showFeedbackDialog(any(ContextualCard.class));
|
||||
|
||||
mController.onDismissed(getTestSliceCard());
|
||||
final ContextualCard card = getTestSliceCard();
|
||||
mController.onDismissed(card);
|
||||
|
||||
final String[] columns = {CardDatabaseHelper.CardColumns.CARD_DISMISSED};
|
||||
final String selection = CardDatabaseHelper.CardColumns.NAME + "=?";
|
||||
@@ -86,6 +91,8 @@ public class SliceContextualCardControllerTest {
|
||||
cr.close();
|
||||
|
||||
assertThat(qryDismissed).isEqualTo(1);
|
||||
verify(mFeatureFactory.mContextualCardFeatureProvider).logContextualCardDismiss(
|
||||
mContext, card);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
|
||||
import com.android.settings.gestures.AssistGestureFeatureProvider;
|
||||
import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
|
||||
import com.android.settings.localepicker.LocaleFeatureProvider;
|
||||
import com.android.settings.overlay.DockUpdaterFeatureProvider;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
@@ -63,6 +64,7 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
public final AssistGestureFeatureProvider assistGestureFeatureProvider;
|
||||
public final AccountFeatureProvider mAccountFeatureProvider;
|
||||
public final PanelFeatureProvider mPanelFeatureProvider;
|
||||
public final ContextualCardFeatureProvider mContextualCardFeatureProvider;
|
||||
|
||||
public SlicesFeatureProvider slicesFeatureProvider;
|
||||
public SearchFeatureProvider searchFeatureProvider;
|
||||
@@ -105,6 +107,7 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
slicesFeatureProvider = mock(SlicesFeatureProvider.class);
|
||||
mAccountFeatureProvider = mock(AccountFeatureProvider.class);
|
||||
mPanelFeatureProvider = mock(PanelFeatureProvider.class);
|
||||
mContextualCardFeatureProvider = mock(ContextualCardFeatureProvider.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -191,4 +194,8 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
public PanelFeatureProvider getPanelFeatureProvider() {
|
||||
return mPanelFeatureProvider;
|
||||
}
|
||||
|
||||
public ContextualCardFeatureProvider getContextualCardFeatureProvider() {
|
||||
return mContextualCardFeatureProvider;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user