diff --git a/app/src/androidTest/assets/views/HabitFrequencyView/render.png b/app/src/androidTest/assets/views/HabitFrequencyView/render.png index 28c46f5a2..70ec73c84 100644 Binary files a/app/src/androidTest/assets/views/HabitFrequencyView/render.png and b/app/src/androidTest/assets/views/HabitFrequencyView/render.png differ diff --git a/app/src/androidTest/assets/views/HabitFrequencyView/renderDataOffset.png b/app/src/androidTest/assets/views/HabitFrequencyView/renderDataOffset.png index 1125e478a..66ac9f4a3 100644 Binary files a/app/src/androidTest/assets/views/HabitFrequencyView/renderDataOffset.png and b/app/src/androidTest/assets/views/HabitFrequencyView/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views/HabitFrequencyView/renderDifferentSize.png b/app/src/androidTest/assets/views/HabitFrequencyView/renderDifferentSize.png index cb5347b1c..7dd7a684c 100644 Binary files a/app/src/androidTest/assets/views/HabitFrequencyView/renderDifferentSize.png and b/app/src/androidTest/assets/views/HabitFrequencyView/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views/HabitFrequencyView/renderTransparent.png b/app/src/androidTest/assets/views/HabitFrequencyView/renderTransparent.png index a0437b31f..6de22cf86 100644 Binary files a/app/src/androidTest/assets/views/HabitFrequencyView/renderTransparent.png and b/app/src/androidTest/assets/views/HabitFrequencyView/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views/HabitHistoryView/render.png b/app/src/androidTest/assets/views/HabitHistoryView/render.png index 499e282c4..276c44523 100644 Binary files a/app/src/androidTest/assets/views/HabitHistoryView/render.png and b/app/src/androidTest/assets/views/HabitHistoryView/render.png differ diff --git a/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png b/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png index 98f26dfa6..acfa02ea5 100644 Binary files a/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png and b/app/src/androidTest/assets/views/HabitHistoryView/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png b/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png index 10d0e0d32..a1c97787f 100644 Binary files a/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png and b/app/src/androidTest/assets/views/HabitHistoryView/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png b/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png index bddba2b02..ac53be76a 100644 Binary files a/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png and b/app/src/androidTest/assets/views/HabitHistoryView/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views/HabitScoreView/render.png b/app/src/androidTest/assets/views/HabitScoreView/render.png index 25e501db4..be130c264 100644 Binary files a/app/src/androidTest/assets/views/HabitScoreView/render.png and b/app/src/androidTest/assets/views/HabitScoreView/render.png differ diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png b/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png index 5196acd2f..d55ce2ed7 100644 Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png and b/app/src/androidTest/assets/views/HabitScoreView/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png b/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png index 7457ddb08..361b9cada 100644 Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png and b/app/src/androidTest/assets/views/HabitScoreView/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png b/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png index cd40166cc..9385f9b48 100644 Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png and b/app/src/androidTest/assets/views/HabitScoreView/renderMonthly.png differ diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png b/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png index 1ac09fa6f..f50bd2685 100644 Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png and b/app/src/androidTest/assets/views/HabitScoreView/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png b/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png index 0d262e37f..555a1fbcc 100644 Binary files a/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png and b/app/src/androidTest/assets/views/HabitScoreView/renderYearly.png differ diff --git a/app/src/androidTest/assets/views/HabitStreakView/render.png b/app/src/androidTest/assets/views/HabitStreakView/render.png index 365231bff..4bab05b52 100644 Binary files a/app/src/androidTest/assets/views/HabitStreakView/render.png and b/app/src/androidTest/assets/views/HabitStreakView/render.png differ diff --git a/app/src/androidTest/assets/views/HabitStreakView/renderSmallSize.png b/app/src/androidTest/assets/views/HabitStreakView/renderSmallSize.png index eaa0ca53e..00eb8daa6 100644 Binary files a/app/src/androidTest/assets/views/HabitStreakView/renderSmallSize.png and b/app/src/androidTest/assets/views/HabitStreakView/renderSmallSize.png differ diff --git a/app/src/androidTest/assets/views/HabitStreakView/renderTransparent.png b/app/src/androidTest/assets/views/HabitStreakView/renderTransparent.png index 408a215d3..2255c156d 100644 Binary files a/app/src/androidTest/assets/views/HabitStreakView/renderTransparent.png and b/app/src/androidTest/assets/views/HabitStreakView/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views/RingView/render.png b/app/src/androidTest/assets/views/RingView/render.png index c77355c7c..b951f0316 100644 Binary files a/app/src/androidTest/assets/views/RingView/render.png and b/app/src/androidTest/assets/views/RingView/render.png differ diff --git a/app/src/androidTest/assets/views/RingView/renderDifferentParams.png b/app/src/androidTest/assets/views/RingView/renderDifferentParams.png index 02dfdf803..356bae29d 100644 Binary files a/app/src/androidTest/assets/views/RingView/renderDifferentParams.png and b/app/src/androidTest/assets/views/RingView/renderDifferentParams.png differ diff --git a/app/src/androidTest/assets/views/RingView/renderLongLabel.png b/app/src/androidTest/assets/views/RingView/renderLongLabel.png index 48b9998ab..e8e832499 100644 Binary files a/app/src/androidTest/assets/views/RingView/renderLongLabel.png and b/app/src/androidTest/assets/views/RingView/renderLongLabel.png differ diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java index a73f5cd9d..a9a15d9ed 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java @@ -48,6 +48,8 @@ public class BaseTest } targetContext = InstrumentationRegistry.getTargetContext(); + targetContext.setTheme(R.style.AppBaseTheme); + testContext = InstrumentationRegistry.getContext(); DateHelper.setFixedLocalTime(FIXED_LOCAL_TIME); diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java index f78e017db..3e273d06f 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java @@ -52,7 +52,7 @@ public class HabitHistoryViewTest extends ViewTest view = new HabitHistoryView(targetContext); view.setHabit(habit); - measureView(dpToPixels(300), dpToPixels(100), view); + measureView(dpToPixels(400), dpToPixels(200), view); refreshData(view); } @@ -89,7 +89,7 @@ public class HabitHistoryViewTest extends ViewTest public void tapDate_withEditableView() throws Throwable { view.setIsEditable(true); - tap(view, 270, 18); // today's square + tap(view, 360, 36); // today's square waitForAsyncTasks(); long today = DateHelper.getStartOfToday(); @@ -102,9 +102,9 @@ public class HabitHistoryViewTest extends ViewTest int expectedCheckmarkValues[] = habit.checkmarks.getAllValues(); view.setIsEditable(true); - tap(view, 45, 5); // header - tap(view, 270, 30); // tomorrow's square - tap(view, 280, 30); // right axis + tap(view, 118, 13); // header + tap(view, 360, 60); // tomorrow's square + tap(view, 390, 60); // right axis waitForAsyncTasks(); int actualCheckmarkValues[] = habit.checkmarks.getAllValues(); @@ -115,7 +115,7 @@ public class HabitHistoryViewTest extends ViewTest public void tapDate_withReadOnlyView() throws Throwable { view.setIsEditable(false); - tap(view, 270, 30); + tap(view, 360, 36); waitForAsyncTasks(); long today = DateHelper.getStartOfToday(); diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitScoreViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitScoreViewTest.java index 89ccdcdb6..3dd19bb4d 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitScoreViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitScoreViewTest.java @@ -49,7 +49,7 @@ public class HabitScoreViewTest extends ViewTest view.setHabit(habit); view.setBucketSize(7); refreshData(view); - measureView(dpToPixels(300), dpToPixels(100), view); + measureView(dpToPixels(300), dpToPixels(200), view); } @Test diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/NumberViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/NumberViewTest.java index e610bd7a7..a8f371af6 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/NumberViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/NumberViewTest.java @@ -23,6 +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.views.NumberView; import org.junit.Before; import org.junit.Test; @@ -44,7 +45,7 @@ public class NumberViewTest extends ViewTest view = new NumberView(targetContext); view.setLabel("Hello world"); view.setNumber(31); - view.setColor(0); + view.setColor(ColorHelper.CSV_PALETTE[0]); measureView(dpToPixels(100), dpToPixels(100), view); } @@ -67,10 +68,10 @@ public class NumberViewTest extends ViewTest public void testRender_withDifferentParams() throws IOException { view.setNumber(500); - view.setColor(5); + view.setColor(ColorHelper.CSV_PALETTE[5]); view.setTextSize(targetContext.getResources().getDimension(R.dimen.tinyTextSize)); measureView(dpToPixels(200), dpToPixels(200), view); assertRenders(view, "NumberView/renderDifferentParams.png"); } -} +} \ No newline at end of file diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java index 4d92bb40c..6d85136e1 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/RingViewTest.java @@ -22,6 +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.ColorHelper; import org.isoron.uhabits.views.RingView; import org.junit.Before; import org.junit.Test; @@ -43,7 +44,7 @@ public class RingViewTest extends ViewTest view = new RingView(targetContext); view.setLabel("Hello world"); view.setPercentage(0.6f); - view.setColor(0); + view.setColor(ColorHelper.CSV_PALETTE[0]); view.setMaxDiameter(dpToPixels(100)); } @@ -69,7 +70,7 @@ public class RingViewTest extends ViewTest view.setLabel("Habit Strength"); view.setPercentage(0.25f); view.setMaxDiameter(dpToPixels(50)); - view.setColor(5); + view.setColor(ColorHelper.CSV_PALETTE[5]); measureView(dpToPixels(200), dpToPixels(200), view); assertRenders(view, "RingView/renderDifferentParams.png"); diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java index d5e69fa60..d87c3b9fc 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java @@ -80,8 +80,8 @@ public class ViewTest extends BaseTest if(!similarEnough) { - saveBitmap(expectedImagePath, ".scaledExpected", scaledExpected); - String path = saveBitmap(expectedImagePath, ".actual", actual); + saveBitmap(expectedImagePath, ".expected", scaledExpected); + String path = saveBitmap(expectedImagePath, "", actual); errorMessage.append(String.format("Actual rendered image " + "saved to %s", path)); fail(errorMessage.toString()); } diff --git a/run_tests b/run_tests index 637af5b6c..a27bad97f 100755 --- a/run_tests +++ b/run_tests @@ -42,7 +42,7 @@ info "Fetching failed generated files..." mkdir -p ${OUTPUT_DIR}/failed adb pull /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/ \ ${OUTPUT_DIR}/failed >> $LOG 2>> $LOG -adb shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/cache/ >> $LOG 2>> $LOG +adb shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/ >> $LOG 2>> $LOG info "Fetching logcat..." adb logcat -d > ${OUTPUT_DIR}/logcat.txt