isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 17:48:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize file tree according to feature

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-05-26 10:38:59 -04:00
parent ca9745f550
commit 83ef8564e1
75 changed files with 607 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/androidTest/java/org/isoron/uhabits/BaseTest.java
View File

@@ -24,8 +24,8 @@ import android.os.Build;
import android.os.Looper;
import android.support.test.InstrumentationRegistry;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.utils.InterfaceUtils;
import org.isoron.uhabits.tasks.BaseTask;
import org.junit.Before;
@@ -51,8 +51,8 @@ public class BaseTest
targetContext = InstrumentationRegistry.getTargetContext();
testContext = InstrumentationRegistry.getContext();
UIHelper.setFixedTheme(R.style.AppBaseTheme);
DateHelper.setFixedLocalTime(FIXED_LOCAL_TIME);
InterfaceUtils.setFixedTheme(R.style.AppBaseTheme);
DateUtils.setFixedLocalTime(FIXED_LOCAL_TIME);
}
protected void waitForAsyncTasks() throws InterruptedException, TimeoutException

6
app/src/androidTest/java/org/isoron/uhabits/ui/MainTest.java
View File

@@ -29,10 +29,10 @@ import android.support.test.espresso.intent.rule.IntentsTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import org.isoron.uhabits.MainActivity;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.MainActivity;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -300,7 +300,7 @@ public class MainTest
clickMenuItem(R.string.settings);
String date = DateHelper.getBackupDateFormat().format(DateHelper.getLocalTime());
String date = DateUtils.getBackupDateFormat().format(DateUtils.getLocalTime());
date = date.substring(0, date.length() - 2);
clickSettingsItem("Export full backup");

23
app/src/androidTest/java/org/isoron/uhabits/unit/HabitFixtures.java
View File

@@ -23,8 +23,9 @@ import android.content.Context;
import android.support.annotation.Nullable;
import android.util.Log;
import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DatabaseUtils;
import org.isoron.uhabits.utils.FileUtils;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.tasks.BaseTask;
import org.isoron.uhabits.tasks.ExportDBTask;
@@ -50,11 +51,11 @@ public class HabitFixtures
habit.freqDen = 3;
habit.save();
long timestamp = DateHelper.getStartOfToday();
long timestamp = DateUtils.getStartOfToday();
for(boolean c : NON_DAILY_HABIT_CHECKS)
{
if(c) habit.repetitions.toggle(timestamp);
timestamp -= DateHelper.millisecondsInOneDay;
timestamp -= DateUtils.millisecondsInOneDay;
}
return habit;
@@ -80,8 +81,8 @@ public class HabitFixtures
habit.color = 4;
habit.save();
long day = DateHelper.millisecondsInOneDay;
long today = DateHelper.getStartOfToday();
long day = DateUtils.millisecondsInOneDay;
long today = DateUtils.getStartOfToday();
int marks[] = { 0, 1, 3, 5, 7, 8, 9, 10, 12, 14, 15, 17, 19, 20, 26, 27, 28, 50, 51, 52,
53, 54, 58, 60, 63, 65, 70, 71, 72, 73, 74, 75, 80, 81, 83, 89, 90, 91, 95,
102, 103, 108, 109, 120};
@@ -97,7 +98,7 @@ public class HabitFixtures
final int nHabits = 30;
final int nYears = 5;
DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command()
DatabaseUtils.executeAsTransaction(new DatabaseUtils.Command()
{
@Override
public void execute()
@@ -112,8 +113,8 @@ public class HabitFixtures
habit.name = String.format("Habit %d", i);
habit.save();
long today = DateHelper.getStartOfToday();
long day = DateHelper.millisecondsInOneDay;
long today = DateUtils.getStartOfToday();
long day = DateUtils.millisecondsInOneDay;
for(int j = 0; j < 365 * nYears; j++)
@@ -147,12 +148,12 @@ public class HabitFixtures
public static void loadHugeDataSet(Context testContext) throws Throwable
{
File baseDir = DatabaseHelper.getFilesDir("Backups");
File baseDir = FileUtils.getFilesDir("Backups");
if(baseDir == null) fail("baseDir should not be null");
File dst = new File(String.format("%s/%s", baseDir.getPath(), "loopHuge.db"));
InputStream in = testContext.getAssets().open("fixtures/loopHuge.db");
DatabaseHelper.copy(in, dst);
FileUtils.copy(in, dst);
ImportDataTask task = new ImportDataTask(dst, null);
task.execute();

4
app/src/androidTest/java/org/isoron/uhabits/unit/commands/ToggleRepetitionCommandTest.java
View File

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.commands.ToggleRepetitionCommand;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
import org.junit.Before;
@@ -50,7 +50,7 @@ public class ToggleRepetitionCommandTest extends BaseTest
habit = HabitFixtures.createShortHabit();
today = DateHelper.getStartOfToday();
today = DateUtils.getStartOfToday();
command = new ToggleRepetitionCommand(habit, today);
}

4
app/src/androidTest/java/org/isoron/uhabits/unit/io/HabitsCSVExporterTest.java
View File

@@ -25,7 +25,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.uhabits.utils.FileUtils;
import org.isoron.uhabits.io.HabitsCSVExporter;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
@@ -79,7 +79,7 @@ public class HabitsCSVExporterTest extends BaseTest
File parent = outputFile.getParentFile();
if(parent != null) parent.mkdirs();
DatabaseHelper.copy(stream, outputFile);
FileUtils.copy(stream, outputFile);
}
zip.close();

14
app/src/androidTest/java/org/isoron/uhabits/unit/io/ImportTest.java
View File

@@ -25,8 +25,8 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.FileUtils;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.io.GenericImporter;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
@@ -58,18 +58,18 @@ public class ImportTest extends BaseTest
public void setup()
{
super.setup();
DateHelper.setFixedLocalTime(null);
DateUtils.setFixedLocalTime(null);
HabitFixtures.purgeHabits();
context = InstrumentationRegistry.getInstrumentation().getContext();
baseDir = DatabaseHelper.getFilesDir("Backups");
baseDir = FileUtils.getFilesDir("Backups");
if(baseDir == null) fail("baseDir should not be null");
}
private void copyAssetToFile(String assetPath, File dst) throws IOException
{
InputStream in = context.getAssets().open(assetPath);
DatabaseHelper.copy(in, dst);
FileUtils.copy(in, dst);
}
private void importFromFile(String assetFilename) throws IOException
@@ -87,7 +87,7 @@ public class ImportTest extends BaseTest
private boolean containsRepetition(Habit h, int year, int month, int day)
{
GregorianCalendar date = DateHelper.getStartOfTodayCalendar();
GregorianCalendar date = DateUtils.getStartOfTodayCalendar();
date.set(year, month - 1, day);
return h.repetitions.contains(date.getTimeInMillis());
}
@@ -133,7 +133,7 @@ public class ImportTest extends BaseTest
assertThat(habit.reminderHour, equalTo(8));
assertThat(habit.reminderMin, equalTo(0));
boolean[] reminderDays = {false, true, true, true, true, true, false};
assertThat(habit.reminderDays, equalTo(DateHelper.packWeekdayList(reminderDays)));
assertThat(habit.reminderDays, equalTo(DateUtils.packWeekdayList(reminderDays)));
}
@Test

12
app/src/androidTest/java/org/isoron/uhabits/unit/models/CheckmarkListTest.java
View File

@@ -23,7 +23,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
import org.junit.After;
@@ -60,7 +60,7 @@ public class CheckmarkListTest extends BaseTest
@After
public void tearDown()
{
DateHelper.setFixedLocalTime(null);
DateUtils.setFixedLocalTime(null);
}
@Test
@@ -121,8 +121,8 @@ public class CheckmarkListTest extends BaseTest
@Test
public void test_getValues_withValidInterval()
{
long from = DateHelper.getStartOfToday() - 15 * DateHelper.millisecondsInOneDay;
long to = DateHelper.getStartOfToday() - 5 * DateHelper.millisecondsInOneDay;
long from = DateUtils.getStartOfToday() - 15 * DateUtils.millisecondsInOneDay;
long to = DateUtils.getStartOfToday() - 5 * DateUtils.millisecondsInOneDay;
int[] expectedValues = { CHECKED_EXPLICITLY, UNCHECKED, CHECKED_IMPLICITLY,
CHECKED_EXPLICITLY, CHECKED_EXPLICITLY, UNCHECKED, UNCHECKED, UNCHECKED, UNCHECKED,
@@ -169,7 +169,7 @@ public class CheckmarkListTest extends BaseTest
private void travelInTime(int days)
{
DateHelper.setFixedLocalTime(FIXED_LOCAL_TIME +
days * DateHelper.millisecondsInOneDay);
DateUtils.setFixedLocalTime(FIXED_LOCAL_TIME +
days * DateUtils.millisecondsInOneDay);
}
}

6
app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java
View File

@@ -24,7 +24,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import org.hamcrest.MatcherAssert;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
import org.junit.Before;
@@ -285,7 +285,7 @@ public class HabitTest extends BaseTest
Habit habit = new Habit();
if(i % 2 == 0)
{
habit.reminderDays = DateHelper.ALL_WEEK_DAYS;
habit.reminderDays = DateUtils.ALL_WEEK_DAYS;
habit.reminderHour = 8;
habit.reminderMin = 30;
habitsWithReminder.add(habit);
@@ -350,7 +350,7 @@ public class HabitTest extends BaseTest
Habit h = new Habit();
assertThat(h.hasReminder(), is(false));
h.reminderDays = DateHelper.ALL_WEEK_DAYS;
h.reminderDays = DateUtils.ALL_WEEK_DAYS;
h.reminderHour = 8;
h.reminderMin = 30;
assertThat(h.hasReminder(), is(true));

28
app/src/androidTest/java/org/isoron/uhabits/unit/models/RepetitionListTest.java
View File

@@ -23,7 +23,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Repetition;
import org.isoron.uhabits.unit.HabitFixtures;
@@ -62,31 +62,31 @@ public class RepetitionListTest extends BaseTest
@After
public void tearDown()
{
DateHelper.setFixedLocalTime(null);
DateUtils.setFixedLocalTime(null);
}
@Test
public void test_contains()
{
long current = DateHelper.getStartOfToday();
long current = DateUtils.getStartOfToday();
for(boolean b : HabitFixtures.NON_DAILY_HABIT_CHECKS)
{
assertThat(habit.repetitions.contains(current), equalTo(b));
current -= DateHelper.millisecondsInOneDay;
current -= DateUtils.millisecondsInOneDay;
}
for(int i = 0; i < 3; i++)
{
assertThat(habit.repetitions.contains(current), equalTo(false));
current -= DateHelper.millisecondsInOneDay;
current -= DateUtils.millisecondsInOneDay;
}
}
@Test
public void test_delete()
{
long timestamp = DateHelper.getStartOfToday();
long timestamp = DateUtils.getStartOfToday();
assertThat(habit.repetitions.contains(timestamp), equalTo(true));
habit.repetitions.delete(timestamp);
@@ -96,7 +96,7 @@ public class RepetitionListTest extends BaseTest
@Test
public void test_toggle()
{
long timestamp = DateHelper.getStartOfToday();
long timestamp = DateUtils.getStartOfToday();
assertThat(habit.repetitions.contains(timestamp), equalTo(true));
habit.repetitions.toggle(timestamp);
@@ -117,11 +117,11 @@ public class RepetitionListTest extends BaseTest
for(Integer row[] : weekdayCount)
Arrays.fill(row, 0);
GregorianCalendar day = DateHelper.getStartOfTodayCalendar();
GregorianCalendar day = DateUtils.getStartOfTodayCalendar();
// Sets the current date to the end of November
day.set(2015, 10, 30);
DateHelper.setFixedLocalTime(day.getTimeInMillis());
DateUtils.setFixedLocalTime(day.getTimeInMillis());
// Add repetitions randomly from January to December
// Leaves the month of March empty, to check that it returns null
@@ -168,19 +168,19 @@ public class RepetitionListTest extends BaseTest
@Test
public void test_count()
{
long to = DateHelper.getStartOfToday();
long from = to - 9 * DateHelper.millisecondsInOneDay;
long to = DateUtils.getStartOfToday();
long from = to - 9 * DateUtils.millisecondsInOneDay;
assertThat(habit.repetitions.count(from, to), equalTo(6));
to = DateHelper.getStartOfToday() - DateHelper.millisecondsInOneDay;
from = to - 5 * DateHelper.millisecondsInOneDay;
to = DateUtils.getStartOfToday() - DateUtils.millisecondsInOneDay;
from = to - 5 * DateUtils.millisecondsInOneDay;
assertThat(habit.repetitions.count(from, to), equalTo(3));
}
@Test
public void test_getOldest()
{
long expectedOldestTimestamp = DateHelper.getStartOfToday() - 9 * DateHelper.millisecondsInOneDay;
long expectedOldestTimestamp = DateUtils.getStartOfToday() - 9 * DateUtils.millisecondsInOneDay;
assertThat(habit.repetitions.getOldestTimestamp(), equalTo(expectedOldestTimestamp));

16
app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java
View File

@@ -23,8 +23,8 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.utils.DatabaseUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Score;
import org.isoron.uhabits.unit.HabitFixtures;
@@ -57,7 +57,7 @@ public class ScoreListTest extends BaseTest
@After
public void tearDown()
{
DateHelper.setFixedLocalTime(null);
DateUtils.setFixedLocalTime(null);
}
@Test
@@ -104,11 +104,11 @@ public class ScoreListTest extends BaseTest
10129735, 9629735, 9102352, 8546087, 7959357, 7340494, 6687738, 5999234, 5273023,
4507040, 3699107, 2846927, 1948077, 1000000 };
long current = DateHelper.getStartOfToday();
long current = DateUtils.getStartOfToday();
for(int expectedValue : expectedValues)
{
assertThat(habit.scores.getValue(current), equalTo(expectedValue));
current -= DateHelper.millisecondsInOneDay;
current -= DateUtils.millisecondsInOneDay;
}
}
@@ -162,14 +162,14 @@ public class ScoreListTest extends BaseTest
private void toggleRepetitions(final int from, final int to)
{
DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command()
DatabaseUtils.executeAsTransaction(new DatabaseUtils.Command()
{
@Override
public void execute()
{
long today = DateHelper.getStartOfToday();
long today = DateUtils.getStartOfToday();
for (int i = from; i < to; i++)
habit.repetitions.toggle(today - i * DateHelper.millisecondsInOneDay);
habit.repetitions.toggle(today - i * DateUtils.millisecondsInOneDay);
}
});
}

6
app/src/androidTest/java/org/isoron/uhabits/unit/tasks/ImportDataTaskTest.java
View File

@@ -25,7 +25,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import android.widget.ProgressBar;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.uhabits.utils.FileUtils;
import org.isoron.uhabits.tasks.ImportDataTask;
import org.junit.Before;
import org.junit.Test;
@@ -50,14 +50,14 @@ public class ImportDataTaskTest extends BaseTest
{
super.setup();
baseDir = DatabaseHelper.getFilesDir("Backups");
baseDir = FileUtils.getFilesDir("Backups");
if(baseDir == null) fail("baseDir should not be null");
}
private void copyAssetToFile(String assetPath, File dst) throws IOException
{
InputStream in = testContext.getAssets().open(assetPath);
DatabaseHelper.copy(in, dst);
FileUtils.copy(in, dst);
}
private void assertTaskResult(final int expectedResult, String assetFilename) throws Throwable

12
app/src/androidTest/java/org/isoron/uhabits/unit/views/CheckmarkWidgetViewTest.java
View File

@@ -23,8 +23,8 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.utils.InterfaceUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
import org.isoron.uhabits.views.CheckmarkWidgetView;
@@ -45,7 +45,7 @@ public class CheckmarkWidgetViewTest extends ViewTest
public void setup()
{
super.setup();
UIHelper.setFixedTheme(R.style.TransparentWidgetTheme);
InterfaceUtils.setFixedTheme(R.style.TransparentWidgetTheme);
habit = HabitFixtures.createShortHabit();
view = new CheckmarkWidgetView(targetContext);
@@ -63,7 +63,7 @@ public class CheckmarkWidgetViewTest extends ViewTest
@Test
public void testRender_unchecked() throws IOException
{
habit.repetitions.toggle(DateHelper.getStartOfToday());
habit.repetitions.toggle(DateUtils.getStartOfToday());
view.refreshData();
assertRenders(view, "CheckmarkView/unchecked.png");
@@ -72,8 +72,8 @@ public class CheckmarkWidgetViewTest extends ViewTest
@Test
public void testRender_implicitlyChecked() throws IOException
{
long today = DateHelper.getStartOfToday();
long day = DateHelper.millisecondsInOneDay;
long today = DateUtils.getStartOfToday();
long day = DateUtils.millisecondsInOneDay;
habit.repetitions.toggle(today);
habit.repetitions.toggle(today - day);
habit.repetitions.toggle(today - 2 * day);

6
app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java
View File

@@ -22,7 +22,7 @@ package org.isoron.uhabits.unit.views;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.unit.HabitFixtures;
import org.isoron.uhabits.views.HabitHistoryView;
@@ -92,7 +92,7 @@ public class HabitHistoryViewTest extends ViewTest
tap(view, 340, 40); // today's square
waitForAsyncTasks();
long today = DateHelper.getStartOfToday();
long today = DateUtils.getStartOfToday();
assertFalse(habit.repetitions.contains(today));
}
@@ -118,7 +118,7 @@ public class HabitHistoryViewTest extends ViewTest
tap(view, 340, 40); // today's square
waitForAsyncTasks();
long today = DateHelper.getStartOfToday();
long today = DateUtils.getStartOfToday();
assertTrue(habit.repetitions.contains(today));
}

6
app/src/androidTest/java/org/isoron/uhabits/unit/views/NumberViewTest.java
View File

@@ -23,7 +23,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.utils.ColorUtils;
import org.isoron.uhabits.views.NumberView;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +45,7 @@ public class NumberViewTest extends ViewTest
view = new NumberView(targetContext);
view.setLabel("Hello world");
view.setNumber(31);
view.setColor(ColorHelper.CSV_PALETTE[0]);
view.setColor(ColorUtils.CSV_PALETTE[0]);
measureView(dpToPixels(100), dpToPixels(100), view);
}
@@ -68,7 +68,7 @@ public class NumberViewTest extends ViewTest
public void testRender_withDifferentParams() throws IOException
{
view.setNumber(500);
view.setColor(ColorHelper.CSV_PALETTE[5]);
view.setColor(ColorUtils.CSV_PALETTE[5]);
view.setTextSize(targetContext.getResources().getDimension(R.dimen.tinyTextSize));
measureView(dpToPixels(200), dpToPixels(200), view);

6
app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java
View File

@@ -23,7 +23,7 @@ import android.graphics.Color;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.utils.ColorUtils;
import org.isoron.uhabits.views.RingView;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +45,7 @@ public class RingViewTest extends ViewTest
view = new RingView(targetContext);
view.setPercentage(0.6f);
view.setText("60%");
view.setColor(ColorHelper.CSV_PALETTE[0]);
view.setColor(ColorUtils.CSV_PALETTE[0]);
view.setBackgroundColor(Color.WHITE);
view.setThickness(dpToPixels(3));
}
@@ -61,7 +61,7 @@ public class RingViewTest extends ViewTest
public void testRender_withDifferentParams() throws IOException
{
view.setPercentage(0.25f);
view.setColor(ColorHelper.CSV_PALETTE[5]);
view.setColor(ColorUtils.CSV_PALETTE[5]);
measureView(dpToPixels(200), dpToPixels(200), view);
assertRenders(view, "RingView/renderDifferentParams.png");

10
app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java
View File

@@ -27,8 +27,8 @@ import android.view.MotionEvent;
import android.view.View;
import org.isoron.uhabits.BaseTest;
import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.uhabits.helpers.UIHelper;
import org.isoron.uhabits.utils.FileUtils;
import org.isoron.uhabits.utils.InterfaceUtils;
import org.isoron.uhabits.tasks.BaseTask;
import org.isoron.uhabits.views.HabitDataView;
@@ -124,8 +124,8 @@ public class ViewTest extends BaseTest
private String saveBitmap(String filename, String suffix, Bitmap bitmap)
throws IOException
{
File dir = DatabaseHelper.getSDCardDir("test-screenshots");
if(dir == null) dir = DatabaseHelper.getFilesDir("test-screenshots");
File dir = FileUtils.getSDCardDir("test-screenshots");
if(dir == null) dir = FileUtils.getFilesDir("test-screenshots");
if(dir == null) throw new RuntimeException("Could not find suitable dir for screenshots");
filename = filename.replaceAll("\\.png$", suffix + ".png");
@@ -191,7 +191,7 @@ public class ViewTest extends BaseTest
protected int dpToPixels(int dp)
{
return (int) UIHelper.dpToPixels(targetContext, dp);
return (int) InterfaceUtils.dpToPixels(targetContext, dp);
}
protected void tap(GestureDetector.OnGestureListener view, int x, int y) throws InterruptedException