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

Rename checkmark values to NO, YES_AUTO, YES_MANUAL and SKIP

Browse Source 
This makes the source code consistent with the user interface.
This commit is contained in:
Alinson S. Xavier
2020-09-05 18:04:04 -05:00
parent d59ab89426
commit b72cad5316
26 changed files with 154 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
View File

@@ -80,11 +80,11 @@ public class HistoryChartTest extends BaseViewTest
chart.setIsEditable(true);
chart.tap(dpToPixels(340), dpToPixels(40));
verify(controller).onToggleCheckmark(today, Checkmark.SKIPPED);
verify(controller).onToggleCheckmark(today, Checkmark.SKIP);
chart.tap(dpToPixels(340), dpToPixels(40));
verify(controller).onToggleCheckmark(today, Checkmark.UNCHECKED);
verify(controller).onToggleCheckmark(today, Checkmark.NO);
chart.tap(dpToPixels(340), dpToPixels(40));
verify(controller).onToggleCheckmark(today, Checkmark.CHECKED_EXPLICITLY);
verify(controller).onToggleCheckmark(today, Checkmark.YES_MANUAL);
verifyNoMoreInteractions(controller);
}
@@ -94,7 +94,7 @@ public class HistoryChartTest extends BaseViewTest
chart.setIsEditable(true);
chart.setCheckmarks(new int[]{});
chart.tap(dpToPixels(340), dpToPixels(40));
verify(controller).onToggleCheckmark(today, Checkmark.CHECKED_EXPLICITLY);
verify(controller).onToggleCheckmark(today, Checkmark.YES_MANUAL);
verifyNoMoreInteractions(controller);
}

9
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
View File

@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.habits.list.views
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.isoron.uhabits.*
import org.isoron.uhabits.core.models.*
import org.isoron.uhabits.utils.*
@@ -41,7 +40,7 @@ class CheckmarkButtonViewTest : BaseViewTest() {
override fun setUp() {
super.setUp()
view = component.getCheckmarkButtonViewFactory().create().apply {
value = Checkmark.UNCHECKED
value = Checkmark.NO
color = PaletteUtils.getAndroidTestColor(5)
onToggle = { toggled = true }
}
@@ -50,19 +49,19 @@ class CheckmarkButtonViewTest : BaseViewTest() {
@Test
fun testRender_explicitCheck() {
view.value = Checkmark.CHECKED_EXPLICITLY
view.value = Checkmark.YES_MANUAL
assertRendersCheckedExplicitly()
}
@Test
fun testRender_implicitCheck() {
view.value = Checkmark.CHECKED_IMPLICITLY
view.value = Checkmark.YES_AUTO
assertRendersCheckedImplicitly()
}
@Test
fun testRender_unchecked() {
view.value = Checkmark.UNCHECKED
view.value = Checkmark.NO
assertRendersUnchecked()
}

15
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
View File

@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.habits.list.views
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.*
import org.isoron.uhabits.*
@@ -43,13 +42,13 @@ class CheckmarkPanelViewTest : BaseViewTest() {
super.setUp()
prefs.isCheckmarkSequenceReversed = false
val checkmarks = intArrayOf(CHECKED_EXPLICITLY,
CHECKED_EXPLICITLY,
CHECKED_IMPLICITLY,
UNCHECKED,
UNCHECKED,
UNCHECKED,
CHECKED_EXPLICITLY)
val checkmarks = intArrayOf(YES_MANUAL,
YES_MANUAL,
YES_AUTO,
NO,
NO,
NO,
YES_MANUAL)
view = component.getCheckmarkPanelViewFactory().create().apply {
values = checkmarks

8
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
View File

@@ -20,7 +20,7 @@
package org.isoron.uhabits.widgets;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.widget.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -58,7 +58,7 @@ public class CheckmarkWidgetTest extends BaseViewTest
CheckmarkWidget widget = new CheckmarkWidget(targetContext, 0, habit);
view = convertToView(widget, 150, 200);
assertThat(checkmarks.getTodayValue(), equalTo(CHECKED_EXPLICITLY));
assertThat(checkmarks.getTodayValue(), equalTo(YES_MANUAL));
}
@Test
@@ -71,11 +71,11 @@ public class CheckmarkWidgetTest extends BaseViewTest
// possible to capture intents sent to BroadcastReceivers.
button.performClick();
sleep(1000);
assertThat(checkmarks.getTodayValue(), equalTo(SKIPPED));
assertThat(checkmarks.getTodayValue(), equalTo(SKIP));
button.performClick();
sleep(1000);
assertThat(checkmarks.getTodayValue(), equalTo(UNCHECKED));
assertThat(checkmarks.getTodayValue(), equalTo(NO));
}
@Test

4
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
View File

@@ -70,7 +70,7 @@ public class CheckmarkWidgetViewTest extends BaseViewTest
// @Test
// public void testRender_implicitlyChecked() throws IOException
// {
// view.setCheckmarkValue(Checkmark.CHECKED_IMPLICITLY);
// view.setCheckmarkValue(Checkmark.YES_AUTO);
// view.refresh();
// assertRenders(view, PATH + "implicitly_checked.png");
// }
@@ -85,7 +85,7 @@ public class CheckmarkWidgetViewTest extends BaseViewTest
// @Test
// public void testRender_unchecked() throws IOException
// {
// view.setCheckmarkValue(Checkmark.UNCHECKED);
// view.setCheckmarkValue(Checkmark.NO);
// view.refresh();
// assertRenders(view, PATH + "unchecked.png");
// }