Move preferences to uhabits-core

This commit is contained in:
2017-06-02 18:24:12 -04:00
parent d97f94075d
commit b88b3a683d
35 changed files with 554 additions and 494 deletions

View File

@@ -32,9 +32,9 @@ import junit.framework.*;
import org.isoron.androidbase.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.core.tasks.*;
import org.isoron.uhabits.core.utils.*;
import org.isoron.uhabits.preferences.*;
import org.isoron.uhabits.utils.*;
import org.junit.*;
@@ -55,7 +55,7 @@ public class BaseAndroidTest extends TestCase
protected Context targetContext;
protected AndroidPreferences prefs;
protected Preferences prefs;
protected HabitList habitList;

View File

@@ -25,8 +25,8 @@ import android.support.test.uiautomator.*;
import com.linkedin.android.testbutler.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.core.utils.*;
import org.isoron.uhabits.preferences.*;
import org.junit.*;
import java.io.*;
@@ -44,7 +44,7 @@ public class BaseUserInterfaceTest
private HabitList habitList;
private AndroidPreferences prefs;
private Preferences prefs;
private HabitFixtures fixtures;

View File

@@ -23,15 +23,12 @@ import android.support.test.filters.*;
import android.support.test.runner.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.core.utils.*;
import org.isoron.uhabits.preferences.*;
import org.junit.*;
import org.junit.runner.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;
@RunWith(AndroidJUnit4.class)
@MediumTest
@@ -41,7 +38,7 @@ public class HeaderViewTest extends BaseViewTest
private HeaderView view;
private AndroidPreferences prefs;
private Preferences prefs;
private MidnightTimer midnightTimer;
@@ -50,7 +47,7 @@ public class HeaderViewTest extends BaseViewTest
public void setUp()
{
super.setUp();
prefs = mock(AndroidPreferences.class);
prefs = mock(Preferences.class);
midnightTimer = mock(MidnightTimer.class);
view = new HeaderView(targetContext, prefs, midnightTimer);
view.setButtonCount(5);