demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Ephemeris: consider the default weekend dayset (#4253)

Browse Source 
Fix openhab/openhab-addons#16812

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2024-05-27 22:34:54 +02:00 committed by GitHub
parent 4b4f25d31b
commit a5a7eee9a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
View File

@ -107,6 +107,9 @@ public class EphemerisManagerImpl implements EphemerisManager, ConfigOptionProvi
this.localeProvider = localeProvider;
bundle = bundleContext.getBundle();
// Default weekend dayset
addDayset(CONFIG_DAYSET_WEEKEND, List.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY));
try (InputStream stream = bundle.getResource(JOLLYDAY_COUNTRY_DESCRIPTIONS).openStream()) {
final Properties properties = new Properties();
properties.load(stream);

14
itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java
View File

@ -15,8 +15,7 @@ package org.openhab.core.automation.integration.test;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;
import java.time.ZoneId;
import java.time.ZonedDateTime;
@ -148,8 +147,7 @@ public class RuleSimulationTest extends JavaOSGiTest {
List<RuleExecution> executions = ruleEngine.simulateRuleExecutions(from, until).toList();
// Every rule fires twice a week. We simulate for two weeks so we expect 12 executions
// TODO: must be 12, but Ephemeris Condition is not yet evaluated in test, because dayset is not configured.
assertEquals(8, executions.size());
assertEquals(12, executions.size());
Iterator<RuleExecution> it = executions.iterator();
@ -159,16 +157,16 @@ public class RuleSimulationTest extends JavaOSGiTest {
checkExecution(it.next(), cronRuleWithTimeOfDayCondition, 6, 10, 30);
checkExecution(it.next(), timeOfDayTriggerWithDayOfWeekCondition, 6, 16, 00);
checkExecution(it.next(), cronRuleWithTimeOfDayCondition, 8, 10, 30);
// checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 9, 10, 00);
// checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 10, 10, 00);
checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 9, 10, 00);
checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 10, 10, 00);
// Second week
checkExecution(it.next(), timeOfDayTriggerWithDayOfWeekCondition, 11, 16, 00);
checkExecution(it.next(), cronRuleWithTimeOfDayCondition, 13, 10, 30);
checkExecution(it.next(), timeOfDayTriggerWithDayOfWeekCondition, 13, 16, 00);
checkExecution(it.next(), cronRuleWithTimeOfDayCondition, 15, 10, 30);
// checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 16, 10, 00);
// checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 17, 10, 00);
checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 16, 10, 00);
checkExecution(it.next(), timeOfDayTriggerWithEphemerisCondition, 17, 10, 00);
assertFalse(it.hasNext());
}