#123: Filter for Today and Tomorrow

Author: yvolk

README.md

@@ -98,7 +98,10 @@ In particular, see these solutions:
 
 <a id="v4.7"/>
 
-### 2023-12-30 v4.7.1 Show based on keywords in a title
+### 2023-12-31 v4.7.2 Show based on keywords in a title
+* Date range filtering extended with "[Today and Tomorrow](https://github.com/plusonelabs/calendar-widget/issues/123)"
+  option. This is different from the "One day" option as that hides events after current time on the next day,
+  which is a bit confusing.
 * [Show based on keywords in a title](https://github.com/plusonelabs/calendar-widget/issues/122) option added,
   allowing to see events that have certain text included. 
   In addition to existing option "Hide based on keywords in a title".

app/build.gradle

@@ -11,8 +11,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 701
-        versionName '4.7.1'
+        versionCode 702
+        versionName '4.7.2'
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 

app/src/androidTest/java/org/andstatus/todoagenda/TomorrowsTasksInTodaysFilterTest.java

@@ -1,6 +1,7 @@
 package org.andstatus.todoagenda;
 
-import static org.junit.Assert.assertEquals;
+import static org.andstatus.todoagenda.prefs.InstanceSettings.EVENT_RANGE_TODAY;
+import static org.andstatus.todoagenda.prefs.InstanceSettings.EVENT_RANGE_TODAY_AND_TOMORROW;
 
 import org.andstatus.todoagenda.provider.QueryResultsStorage;
 import org.andstatus.todoagenda.widget.WidgetEntryPosition;
@@ -15,11 +16,18 @@ public class TomorrowsTasksInTodaysFilterTest extends BaseWidgetTest {
     public void testIssue102() {
         final String method = "testIssue102";
         QueryResultsStorage inputs = provider.loadResultsAndSettings(
-            org.andstatus.todoagenda.test.R.raw.tomorrows_tasks_today);
+            org.andstatus.todoagenda.test.R.raw.tomorrows_tasks_one_week);
         provider.addResults(inputs);
 
         playResults(method);
-        assertEquals("Number of entries, " + getFactory().getWidgetEntries(), 1, getFactory().getWidgetEntries().size());
-        assertEquals("No events", WidgetEntryPosition.LIST_FOOTER, getFactory().getWidgetEntries().get(0).entryPosition);
+        assertPosition(10, WidgetEntryPosition.LIST_FOOTER);
+
+        getSettings().eventRange = EVENT_RANGE_TODAY;
+        playResults(method);
+        assertPosition(0, WidgetEntryPosition.LIST_FOOTER);
+
+        getSettings().eventRange = EVENT_RANGE_TODAY_AND_TOMORROW;
+        playResults(method);
+        assertPosition(7, WidgetEntryPosition.LIST_FOOTER);
     }
 }