diff --git a/android/src/main/java/com/thebluealliance/androidclient/gcm/GCMMessageHandler.java b/android/src/main/java/com/thebluealliance/androidclient/gcm/GCMMessageHandler.java index 8219773dd..045b125b5 100644 --- a/android/src/main/java/com/thebluealliance/androidclient/gcm/GCMMessageHandler.java +++ b/android/src/main/java/com/thebluealliance/androidclient/gcm/GCMMessageHandler.java @@ -27,7 +27,6 @@ import com.thebluealliance.androidclient.datafeed.MyTbaDatafeed; import com.thebluealliance.androidclient.datafeed.status.TBAStatusController; import com.thebluealliance.androidclient.di.components.DaggerNotificationComponent; -import com.thebluealliance.androidclient.di.components.NotificationComponent; import com.thebluealliance.androidclient.eventbus.NotificationsUpdatedEvent; import com.thebluealliance.androidclient.gcm.notifications.AllianceSelectionNotification; import com.thebluealliance.androidclient.gcm.notifications.AwardsPostedNotification; @@ -88,26 +87,22 @@ public class GCMMessageHandler extends JobIntentService implements FollowsChecke @Inject AccountController mAccountController; @Inject AppConfig mAppConfig; - private NotificationComponent mComponenet; - @Override public void onCreate() { super.onCreate(); - getComponent(); - mComponenet.inject(this); + inject(); } - private void getComponent() { - if (mComponenet == null) { - TbaAndroid application = ((TbaAndroid) getApplication()); - mComponenet = DaggerNotificationComponent.builder() - .applicationComponent(application.getComponent()) - .datafeedModule(application.getDatafeedModule()) - .rendererModule(new RendererModule()) - .authModule(application.getAuthModule()) - .gcmModule(application.getGcmModule()) - .build(); - } + protected void inject() { + TbaAndroid application = ((TbaAndroid) getApplication()); + DaggerNotificationComponent.builder() + .applicationComponent(application.getComponent()) + .datafeedModule(application.getDatafeedModule()) + .rendererModule(new RendererModule()) + .authModule(application.getAuthModule()) + .gcmModule(application.getGcmModule()) + .build() + .inject(this); } @Override @@ -133,7 +128,7 @@ public static void enqueueWork(Context context, Intent work) { } @Override - protected void onHandleWork(Intent intent) { + public void onHandleWork(Intent intent) { Bundle extras = intent.getExtras(); if (extras == null) { TbaLogger.w("Intent with no extras!"); @@ -205,13 +200,18 @@ public void handleMessage(Context c, String messageType, String messageData) { break; } - if (notification == null) return; + if (notification == null) { + TbaLogger.w("Unknown notification for type " + messageType); + return; + } + + TbaLogger.d("Notification type picked"); try { notification.parseMessageData(); + TbaLogger.d("JSON Data parsed"); } catch (JsonParseException e) { - TbaLogger.e("Error parsing incoming message json"); - e.printStackTrace(); + TbaLogger.e("Error parsing incoming message json", e); return; } @@ -220,7 +220,10 @@ public void handleMessage(Context c, String messageType, String messageData) { Notification built; built = notification.buildNotification(c, this); - if (built == null) return; + if (built == null) { + TbaLogger.d("Unable to build notification type " + messageType); + return; + } /* Update the data coming from this notification in the local db */ notification.updateDataLocally(); @@ -252,6 +255,8 @@ public void handleMessage(Context c, String messageType, String messageData) { notify(c, notification, built); } + } else { + TbaLogger.d("Notification type " + messageType + " disabled by config"); } } catch (Exception e) { // We probably tried to post a null notification or something like that. Oops... @@ -264,6 +269,7 @@ private void notify(Context c, BaseNotification notification, Notification built int id = STACK_NOTIFICATIONS ? notification.getNotificationId() : SINGULAR_NOTIFICATION_ID; setNotificationParams(built, c, notification.getNotificationType(), mPrefs); + TbaLogger.i(("Notifying: " + id)); notificationManager.notify(id, built); } diff --git a/android/src/test/java/com/thebluealliance/androidclient/database/DatabaseMocker.java b/android/src/test/java/com/thebluealliance/androidclient/database/DatabaseMocker.java index 9e7420b79..d90e194ca 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/database/DatabaseMocker.java +++ b/android/src/test/java/com/thebluealliance/androidclient/database/DatabaseMocker.java @@ -7,9 +7,11 @@ import com.thebluealliance.androidclient.database.tables.DistrictsTable; import com.thebluealliance.androidclient.database.tables.EventTeamsTable; import com.thebluealliance.androidclient.database.tables.EventsTable; +import com.thebluealliance.androidclient.database.tables.FavoritesTable; import com.thebluealliance.androidclient.database.tables.MatchesTable; import com.thebluealliance.androidclient.database.tables.MediasTable; import com.thebluealliance.androidclient.database.tables.NotificationsTable; +import com.thebluealliance.androidclient.database.tables.SubscriptionsTable; import com.thebluealliance.androidclient.database.tables.TeamsTable; import com.thebluealliance.androidclient.datafeed.HttpModule; @@ -96,4 +98,20 @@ public static MediasTable mockMediasTable(Database database) { return table; } + public static FavoritesTable mockFavoritesTable(Database database) { + SQLiteDatabase db = mock(SQLiteDatabase.class); + FavoritesTable table = new FavoritesTable(db); + when(database.getFavoritesTable()).thenReturn(table); + when(database.getWritableDatabase()).thenReturn(db); + return table; + } + + public static SubscriptionsTable mockSubscriptionsTable(Database database) { + SQLiteDatabase db = mock(SQLiteDatabase.class); + SubscriptionsTable table = new SubscriptionsTable(db); + when(database.getSubscriptionsTable()).thenReturn(table); + when(database.getWritableDatabase()).thenReturn(db); + return table; + } + } diff --git a/android/src/test/java/com/thebluealliance/androidclient/di/MockNotificationComponent.java b/android/src/test/java/com/thebluealliance/androidclient/di/MockNotificationComponent.java new file mode 100644 index 000000000..926ed15ac --- /dev/null +++ b/android/src/test/java/com/thebluealliance/androidclient/di/MockNotificationComponent.java @@ -0,0 +1,15 @@ +package com.thebluealliance.androidclient.di; + +import com.thebluealliance.androidclient.gcm.GCMMessageHandlerWithMocks; + +import javax.inject.Singleton; + +import dagger.Component; + +@Singleton +@Component( + modules = {MockGceModule.class, MockRendererModule.class, MockConfigModule.class, MockGcmModule.class, MockAccountModule.class, MockAuthModule.class}, + dependencies = MockApplicationComponent.class) +public interface MockNotificationComponent { + void inject(GCMMessageHandlerWithMocks handlerWithMocks); +} diff --git a/android/src/test/java/com/thebluealliance/androidclient/di/MockTbaAndroidModule.java b/android/src/test/java/com/thebluealliance/androidclient/di/MockTbaAndroidModule.java index 9aa3154be..be10bb0ec 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/di/MockTbaAndroidModule.java +++ b/android/src/test/java/com/thebluealliance/androidclient/di/MockTbaAndroidModule.java @@ -33,6 +33,7 @@ import javax.inject.Singleton; +import androidx.test.core.app.ApplicationProvider; import dagger.Lazy; import dagger.Module; import dagger.Provides; @@ -40,7 +41,7 @@ import static org.mockito.Mockito.spy; @Module -public class MockTbaAndroidModule { +public class MockTbaAndroidModule { @Provides @Singleton @@ -57,7 +58,7 @@ public Database provideDatabase() { @Provides @Singleton public SharedPreferences provideSharedPrefs(Context context) { - return Mockito.mock(SharedPreferences.class); + return ApplicationProvider.getApplicationContext().getSharedPreferences("prefs", 0); } @Provides diff --git a/android/src/test/java/com/thebluealliance/androidclient/gcm/GCMMessageHandlerTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/GCMMessageHandlerTest.java new file mode 100644 index 000000000..ad1d0f2a0 --- /dev/null +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/GCMMessageHandlerTest.java @@ -0,0 +1,88 @@ +package com.thebluealliance.androidclient.gcm; + +import android.app.Notification; +import android.app.NotificationManager; +import android.content.Context; +import android.content.Intent; + +import com.google.gson.JsonObject; +import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; +import com.thebluealliance.androidclient.gcm.notifications.BaseNotification; +import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.runners.Enclosed; +import org.junit.runner.RunWith; +import org.robolectric.ParameterizedRobolectricTestRunner; +import org.robolectric.Robolectric; +import org.robolectric.Shadows; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import androidx.test.core.app.ApplicationProvider; + +import static org.junit.Assert.assertEquals; + +@RunWith(Enclosed.class) +public class GCMMessageHandlerTest { + + @RunWith(ParameterizedRobolectricTestRunner.class) + public static class TestRenderSingleNotifications { + + private NotificationManager mNotificationManager; + + @ParameterizedRobolectricTestRunner.Parameter(0) + public String mNotificationType; + @ParameterizedRobolectricTestRunner.Parameter(1) + public String mNotificationDataFileName; + @ParameterizedRobolectricTestRunner.Parameter(2) + public int mExpectedPriority; + + @Before + public void setUp() { + Context applicationContext = ApplicationProvider.getApplicationContext(); + mNotificationManager = (NotificationManager) applicationContext.getSystemService(Context.NOTIFICATION_SERVICE); + } + + @ParameterizedRobolectricTestRunner.Parameters(name = "NotificationType = {0}") + public static Collection data() { + return Arrays.asList(new Object[][]{ + {NotificationTypes.ALLIANCE_SELECTION, "notification_alliance_selection", Notification.PRIORITY_HIGH}, + {NotificationTypes.AWARDS, "notification_awards_posted", Notification.PRIORITY_HIGH}, + {NotificationTypes.DISTRICT_POINTS_UPDATED, "notification_district_points_updated", Notification.PRIORITY_HIGH}, + {NotificationTypes.EVENT_DOWN, "notification_event_down", Notification.PRIORITY_HIGH}, + {NotificationTypes.LEVEL_STARTING, "notification_level_starting", Notification.PRIORITY_HIGH}, + {NotificationTypes.MATCH_SCORE, "notification_match_score", Notification.PRIORITY_HIGH}, + {NotificationTypes.PING, "notification_ping", Notification.PRIORITY_LOW}, + {NotificationTypes.SCHEDULE_UPDATED, "notification_schedule_updated", Notification.PRIORITY_HIGH}, + {NotificationTypes.UPCOMING_MATCH, "notification_upcoming_match", Notification.PRIORITY_HIGH}, + }); + } + + @Test + public void testPostSingleNotification() { + Intent intent = buildIntent(mNotificationType, mNotificationDataFileName); + GCMMessageHandlerWithMocks service = Robolectric.setupService(GCMMessageHandlerWithMocks.class); + service.onCreate(); + service.onHandleWork(intent); + + List notifications = Shadows.shadowOf(mNotificationManager).getAllNotifications(); + assertEquals(1, notifications.size()); + + Notification notification = notifications.get(0); + assertEquals(BaseNotification.NOTIFICATION_CHANNEL, notification.getChannelId()); + assertEquals(mExpectedPriority, notification.priority); + } + } + + private static Intent buildIntent(String notificationType, String dataFileName) { + JsonObject notificationData = ModelMaker.getModel(JsonObject.class, dataFileName); + Intent intent = new Intent("com.google.android.c2dm.intent.RECEIVE"); + intent.putExtra("notification_type", notificationType); + intent.putExtra("message_data", notificationData.toString()); + return intent; + } +} diff --git a/android/src/test/java/com/thebluealliance/androidclient/gcm/GCMMessageHandlerWithMocks.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/GCMMessageHandlerWithMocks.java new file mode 100644 index 000000000..93b3c6af8 --- /dev/null +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/GCMMessageHandlerWithMocks.java @@ -0,0 +1,36 @@ +package com.thebluealliance.androidclient.gcm; + +import com.thebluealliance.androidclient.TestTbaAndroid; +import com.thebluealliance.androidclient.database.DatabaseMocker; +import com.thebluealliance.androidclient.di.DaggerMockNotificationComponent; +import com.thebluealliance.androidclient.di.MockRendererModule; + +public class GCMMessageHandlerWithMocks extends GCMMessageHandler { + + /* + * A version of the service that does its DI using mocks + */ + + @Override + protected void inject() { + TestTbaAndroid application = ((TestTbaAndroid) getApplication()); + DaggerMockNotificationComponent.builder() + .mockApplicationComponent(application.getMockComponent()) + .mockDatafeedModule(application.getMockDatafeedModule()) + .mockRendererModule(new MockRendererModule()) + .mockAuthModule(application.getMockAuthModule()) + .mockGcmModule(application.getMockGcmModule()) + .build() + .inject(this); + initMocks(); + } + + public void initMocks() { + DatabaseMocker.mockMatchesTable(mDb); + DatabaseMocker.mockEventsTable(mDb); + DatabaseMocker.mockAwardsTable(mDb); + DatabaseMocker.mockFavoritesTable(mDb); + DatabaseMocker.mockSubscriptionsTable(mDb); + DatabaseMocker.mockNotificationsTable(mDb); + } +} diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/AllianceSelectionNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AllianceSelectionNotificationTest.java similarity index 92% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/AllianceSelectionNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AllianceSelectionNotificationTest.java index 340bd3d10..901412b3f 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/AllianceSelectionNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AllianceSelectionNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.app.Notification; import android.content.Context; @@ -11,8 +11,6 @@ import com.thebluealliance.androidclient.adapters.ViewEventFragmentPagerAdapter; import com.thebluealliance.androidclient.database.writers.EventWriter; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.AllianceSelectionNotification; -import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; import com.thebluealliance.androidclient.helpers.MyTBAHelper; import com.thebluealliance.androidclient.models.Event; import com.thebluealliance.androidclient.models.StoredNotification; @@ -35,8 +33,10 @@ @RunWith(AndroidJUnit4.class) public class AllianceSelectionNotificationTest { - @Mock private Context mContext; - @Mock private EventWriter mWriter; + @Mock + private Context mContext; + @Mock + private EventWriter mWriter; private AllianceSelectionNotification mNotification; private JsonObject mData; diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/AwardsPostedNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AwardsPostedNotificationTest.java similarity index 93% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/AwardsPostedNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AwardsPostedNotificationTest.java index 7ba9f0d57..6a3671fc8 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/AwardsPostedNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AwardsPostedNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.app.Notification; import android.content.Context; @@ -11,8 +11,6 @@ import com.thebluealliance.androidclient.adapters.ViewEventFragmentPagerAdapter; import com.thebluealliance.androidclient.database.writers.AwardListWriter; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.AwardsPostedNotification; -import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; import com.thebluealliance.androidclient.helpers.MyTBAHelper; import com.thebluealliance.androidclient.models.Award; import com.thebluealliance.androidclient.models.StoredNotification; @@ -37,8 +35,10 @@ @RunWith(AndroidJUnit4.class) public class AwardsPostedNotificationTest { - @Mock private Context mContext; - @Mock private AwardListWriter mWriter; + @Mock + private Context mContext; + @Mock + private AwardListWriter mWriter; private AwardsPostedNotification mNotification; private JsonObject mData; diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/CompLevelStartingNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/CompLevelStartingNotificationTest.java similarity index 96% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/CompLevelStartingNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/CompLevelStartingNotificationTest.java index f7d88aa4a..3ab823986 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/CompLevelStartingNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/CompLevelStartingNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.app.Notification; import android.content.Context; @@ -10,8 +10,6 @@ import com.thebluealliance.androidclient.activities.ViewEventActivity; import com.thebluealliance.androidclient.adapters.ViewEventFragmentPagerAdapter; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.CompLevelStartingNotification; -import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; import com.thebluealliance.androidclient.helpers.MyTBAHelper; import com.thebluealliance.androidclient.models.StoredNotification; diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/DistrictPointsUpdatedNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/DistrictPointsUpdatedNotificationTest.java similarity index 92% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/DistrictPointsUpdatedNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/DistrictPointsUpdatedNotificationTest.java index 1bcb73dbb..4b5d5ba5e 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/DistrictPointsUpdatedNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/DistrictPointsUpdatedNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.app.Notification; import android.content.Context; @@ -9,8 +9,6 @@ import com.thebluealliance.androidclient.R; import com.thebluealliance.androidclient.activities.ViewDistrictActivity; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.DistrictPointsUpdatedNotification; -import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; import com.thebluealliance.androidclient.helpers.MyTBAHelper; import com.thebluealliance.androidclient.models.StoredNotification; import com.thebluealliance.androidclient.viewmodels.GenericNotificationViewModel; @@ -70,7 +68,7 @@ public void testBuildNotification() { assertNotNull(stored); assertEquals(stored.getType(), NotificationTypes.DISTRICT_POINTS_UPDATED); assertEquals(stored.getTitle(), mContext.getString(R.string.notification_district_points_title, "PNW")); - assertEquals(stored.getBody(), mContext.getString(R.string.notification_district_points_updated,"Pacific Northwest")); + assertEquals(stored.getBody(), mContext.getString(R.string.notification_district_points_updated, "Pacific Northwest")); assertEquals(stored.getMessageData(), mData.toString()); assertEquals(stored.getIntent(), MyTBAHelper.serializeIntent(mNotification.getIntent(mContext))); assertNotNull(stored.getTime()); diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/GenericNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/GenericNotificationTest.java similarity index 81% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/GenericNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/GenericNotificationTest.java index 5f3f8452b..e55946d5d 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/GenericNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/GenericNotificationTest.java @@ -1,9 +1,7 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import com.google.gson.JsonObject; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.GenericNotification; -import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; import org.junit.Before; import org.junit.Test; diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/ScheduleUpdatedNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScheduleUpdatedNotificationTest.java similarity index 94% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/ScheduleUpdatedNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScheduleUpdatedNotificationTest.java index d4c856e66..0d7e8b8e5 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/ScheduleUpdatedNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScheduleUpdatedNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.app.Notification; import android.content.Context; @@ -10,8 +10,6 @@ import com.thebluealliance.androidclient.activities.ViewEventActivity; import com.thebluealliance.androidclient.adapters.ViewEventFragmentPagerAdapter; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.NotificationTypes; -import com.thebluealliance.androidclient.gcm.notifications.ScheduleUpdatedNotification; import com.thebluealliance.androidclient.helpers.MyTBAHelper; import com.thebluealliance.androidclient.models.StoredNotification; diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/ScoreNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScoreNotificationTest.java similarity index 92% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/ScoreNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScoreNotificationTest.java index 09a24f403..8ca95b6b4 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/ScoreNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScoreNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.content.Context; import android.content.Intent; @@ -8,7 +8,6 @@ import com.thebluealliance.androidclient.activities.ViewMatchActivity; import com.thebluealliance.androidclient.database.writers.MatchWriter; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.ScoreNotification; import com.thebluealliance.androidclient.models.Match; import com.thebluealliance.androidclient.renderers.MatchRenderer; @@ -30,9 +29,12 @@ @RunWith(AndroidJUnit4.class) public class ScoreNotificationTest { - @Mock private Context mContext; - @Mock private MatchWriter mWriter; - @Mock private MatchRenderer mRenderer; + @Mock + private Context mContext; + @Mock + private MatchWriter mWriter; + @Mock + private MatchRenderer mRenderer; private ScoreNotification mNotification; private JsonObject mData; diff --git a/android/src/test/java/com/thebluealliance/androidclient/notifications/UpcomingMatchNotificationTest.java b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/UpcomingMatchNotificationTest.java similarity index 96% rename from android/src/test/java/com/thebluealliance/androidclient/notifications/UpcomingMatchNotificationTest.java rename to android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/UpcomingMatchNotificationTest.java index 16b460dae..832ea1faf 100644 --- a/android/src/test/java/com/thebluealliance/androidclient/notifications/UpcomingMatchNotificationTest.java +++ b/android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/UpcomingMatchNotificationTest.java @@ -1,4 +1,4 @@ -package com.thebluealliance.androidclient.notifications; +package com.thebluealliance.androidclient.gcm.notifications; import android.content.Context; import android.content.Intent; @@ -7,7 +7,6 @@ import com.google.gson.JsonParseException; import com.thebluealliance.androidclient.activities.ViewMatchActivity; import com.thebluealliance.androidclient.datafeed.framework.ModelMaker; -import com.thebluealliance.androidclient.gcm.notifications.UpcomingMatchNotification; import org.junit.Before; import org.junit.Test;