diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index 5aede98f5..714299396 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java @@ -62,8 +62,6 @@ public class BaseAndroidTest extends TestCase protected TaskRunner taskRunner; - protected HabitLogger logger; - protected HabitFixtures fixtures; protected CountDownLatch latch; @@ -101,7 +99,6 @@ public class BaseAndroidTest extends TestCase prefs = appComponent.getPreferences(); habitList = appComponent.getHabitList(); taskRunner = appComponent.getTaskRunner(); - logger = appComponent.getHabitsLogger(); modelFactory = appComponent.getModelFactory(); prefs.clear(); diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java deleted file mode 100644 index 75f821787..000000000 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2016 Álinson Santos Xavier - * - * This file is part of Loop Habit Tracker. - * - * Loop Habit Tracker is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Loop Habit Tracker is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -package org.isoron.uhabits; - -import android.os.*; -import android.support.test.filters.*; -import android.support.test.runner.*; - -import org.isoron.androidbase.*; -import org.isoron.uhabits.core.models.*; -import org.junit.*; -import org.junit.runner.*; - -import java.io.*; - -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.MatcherAssert.*; - -@RunWith(AndroidJUnit4.class) -@MediumTest -public class HabitLoggerTest extends BaseAndroidTest -{ - @Test - public void testLogReminderScheduled() throws IOException - { - if (!isLogcatAvailable()) return; - - long time = 1422277200000L; // 13:00 jan 26, 2015 (UTC) - Habit habit = fixtures.createEmptyHabit(); - habit.setName("Write journal"); - - logger.logReminderScheduled(habit, time); - - String expectedMsg = "Setting alarm (2015-01-26 130000): Wri\n"; - assertLogcatContains(expectedMsg); - } - - protected void assertLogcatContains(String expectedMsg) throws IOException - { - String logcat = new AndroidBugReporter(targetContext).getLogcat(); - assertThat(logcat, containsString(expectedMsg)); - } - - protected boolean isLogcatAvailable() - { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; - } -} diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt deleted file mode 100644 index 8a39b7517..000000000 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2016 Álinson Santos Xavier - * - * This file is part of Loop Habit Tracker. - * - * Loop Habit Tracker is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Loop Habit Tracker is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -package org.isoron.uhabits - -import android.util.* -import org.isoron.uhabits.core.* -import org.isoron.uhabits.core.models.* -import org.isoron.uhabits.core.utils.* -import java.util.* -import javax.inject.* - -@AppScope -class HabitLogger -@Inject constructor() { - - -} diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java index 3fd635f22..8c110ab26 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java @@ -63,8 +63,6 @@ public interface HabitsApplicationComponent HabitList getHabitList(); - HabitLogger getHabitsLogger(); - IntentFactory getIntentFactory(); IntentParser getIntentParser(); diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt index db04dd16b..934942f15 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt @@ -39,8 +39,7 @@ import javax.inject.* class IntentScheduler @Inject constructor( @AppContext context: Context, - private val pendingIntents: PendingIntentFactory, - private val logger: HabitLogger + private val pendingIntents: PendingIntentFactory ) : ReminderScheduler.SystemScheduler { private val manager =