Fix default color and failing tests

This commit is contained in:
2017-06-04 13:08:42 -04:00
parent cf25229fbc
commit 277738f94d
5 changed files with 9 additions and 9 deletions

View File

@@ -53,7 +53,7 @@ public class HabitFixtures
Habit habit = modelFactory.buildHabit();
habit.setName("Meditate");
habit.setDescription("Did you meditate this morning?");
habit.setColor(3);
habit.setColor(5);
habit.setFrequency(Frequency.DAILY);
habit.setId(id);
habitList.add(habit);
@@ -64,7 +64,7 @@ public class HabitFixtures
{
Habit habit = createEmptyHabit();
habit.setFrequency(new Frequency(3, 7));
habit.setColor(4);
habit.setColor(7);
long day = DateUtils.millisecondsInOneDay;
long today = DateUtils.getStartOfToday();

View File

@@ -51,7 +51,7 @@ public class NumberButtonViewTest extends BaseViewTest
view = new NumberButtonView(targetContext);
view.setUnit("steps");
view.setThreshold(100.0);
view.setColor(ColorUtils.getAndroidTestColor(5));
view.setColor(ColorUtils.getAndroidTestColor(8));
measureView(view, dpToPixels(48), dpToPixels(48));

View File

@@ -180,8 +180,8 @@ public class HabitListTest extends BaseAndroidTest
String expectedCSV =
"Position,Name,Description,NumRepetitions,Interval,Color\n" +
"001,Meditate,Did you meditate this morning?,1,1,#F9A825\n" +
"002,Wake up early,Did you wake up before 6am?,2,3,#388E3C\n";
"001,Meditate,Did you meditate this morning?,1,1,#FF8F00\n" +
"002,Wake up early,Did you wake up before 6am?,2,3,#AFB42B\n";
StringWriter writer = new StringWriter();
habitList.writeCSV(writer);