From 590298bf5b5977ddc1677d76e8fb22099a315822 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 23 Aug 2020 07:41:42 -0500 Subject: [PATCH] MemoryHabitList: Inherit parent's order Fixes #598 --- .../core/models/memory/MemoryHabitList.java | 1 + .../isoron/uhabits/core/models/HabitListTest.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java index 80a6d514a..1833f25a2 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java @@ -55,6 +55,7 @@ public class MemoryHabitList extends HabitList super(matcher); this.parent = parent; this.comparator = comparator; + this.order = parent.order; parent.getObservable().addListener(this::loadFromParent); loadFromParent(); } diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java index 206caafe6..5463ee6ea 100644 --- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java +++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java @@ -31,8 +31,7 @@ import static junit.framework.TestCase.assertFalse; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.isoron.uhabits.core.models.HabitList.Order.*; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; @SuppressWarnings("JavaDoc") public class HabitListTest extends BaseUnitTest @@ -211,6 +210,17 @@ public class HabitListTest extends BaseUnitTest habitList.reorder(h1, h2); } + @Test + public void testOrder_inherit() + { + habitList.setOrder(BY_COLOR_ASC); + HabitList filteredList = habitList.getFiltered(new HabitMatcherBuilder() + .setArchivedAllowed(false) + .setCompletedAllowed(false) + .build()); + assertEquals(filteredList.getOrder(), BY_COLOR_ASC); + } + @Test public void testWriteCSV() throws IOException {