isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-10 02:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow user to sort habits in reverse order

Browse Source 
Closes #556, closes #497
This commit is contained in:
Alinson S. Xavier
2020-08-15 12:29:49 -05:00
parent acb5051eec
commit 3e99d821a5
7 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
View File

@@ -144,7 +144,13 @@ public class HabitListTest extends BaseUnitTest
assertThat(list.getByPosition(2), equalTo(h4));
assertThat(list.getByPosition(3), equalTo(h2));
list.setOrder(BY_NAME);
list.setOrder(BY_NAME_DESC);
assertThat(list.getByPosition(0), equalTo(h4));
assertThat(list.getByPosition(1), equalTo(h3));
assertThat(list.getByPosition(2), equalTo(h2));
assertThat(list.getByPosition(3), equalTo(h1));
list.setOrder(BY_NAME_ASC);
assertThat(list.getByPosition(0), equalTo(h1));
assertThat(list.getByPosition(1), equalTo(h2));
assertThat(list.getByPosition(2), equalTo(h3));
@@ -154,12 +160,18 @@ public class HabitListTest extends BaseUnitTest
list.add(h1);
assertThat(list.getByPosition(0), equalTo(h1));
list.setOrder(BY_COLOR);
list.setOrder(BY_COLOR_ASC);
assertThat(list.getByPosition(0), equalTo(h3));
assertThat(list.getByPosition(1), equalTo(h4));
assertThat(list.getByPosition(2), equalTo(h1));
assertThat(list.getByPosition(3), equalTo(h2));
list.setOrder(BY_COLOR_DESC);
assertThat(list.getByPosition(0), equalTo(h2));
assertThat(list.getByPosition(1), equalTo(h1));
assertThat(list.getByPosition(2), equalTo(h4));
assertThat(list.getByPosition(3), equalTo(h3));
list.setOrder(BY_POSITION);
assertThat(list.getByPosition(0), equalTo(h3));
assertThat(list.getByPosition(1), equalTo(h1));
@@ -284,7 +296,7 @@ public class HabitListTest extends BaseUnitTest
@Test
public void testReorder_onSortedList() throws Exception
{
habitList.setOrder(BY_SCORE);
habitList.setOrder(BY_SCORE_DESC);
Habit h1 = habitsArray.get(1);
Habit h2 = habitsArray.get(2);
thrown.expect(IllegalStateException.class);

4
android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java
View File

@@ -77,8 +77,8 @@ public class PreferencesTest extends BaseUnitTest
{
assertThat(prefs.getDefaultOrder(), equalTo(HabitList.Order.BY_POSITION));
prefs.setDefaultOrder(HabitList.Order.BY_SCORE);
assertThat(prefs.getDefaultOrder(), equalTo(HabitList.Order.BY_SCORE));
prefs.setDefaultOrder(HabitList.Order.BY_SCORE_DESC);
assertThat(prefs.getDefaultOrder(), equalTo(HabitList.Order.BY_SCORE_DESC));
storage.putString("pref_default_order", "BOGUS");
assertThat(prefs.getDefaultOrder(), equalTo(HabitList.Order.BY_POSITION));

6
android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
View File

@@ -104,7 +104,7 @@ public class ListHabitsMenuBehaviorTest extends BaseUnitTest
{
behavior.onSortByColor();
verify(adapter).setOrder(orderCaptor.capture());
assertThat(orderCaptor.getValue(), equalTo(BY_COLOR));
assertThat(orderCaptor.getValue(), equalTo(BY_COLOR_ASC));
}
@Test
@@ -120,7 +120,7 @@ public class ListHabitsMenuBehaviorTest extends BaseUnitTest
{
behavior.onSortByScore();
verify(adapter).setOrder(orderCaptor.capture());
assertThat(orderCaptor.getValue(), equalTo(BY_SCORE));
assertThat(orderCaptor.getValue(), equalTo(BY_SCORE_DESC));
}
@Test
@@ -128,7 +128,7 @@ public class ListHabitsMenuBehaviorTest extends BaseUnitTest
{
behavior.onSortByName();
verify(adapter).setOrder(orderCaptor.capture());
assertThat(orderCaptor.getValue(), equalTo(BY_NAME));
assertThat(orderCaptor.getValue(), equalTo(BY_NAME_ASC));
}
@Test