demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix division-by-zero error in Persistence average (#3556)

Browse Source 
* Fix division-by-zero error in Persistence average
* Add test

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng
2023-04-15 16:03:45 +02:00
committed by GitHub
parent 9e334497f9
commit 7a9b76dfdf
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/extensions/PersistenceExtensions.java
+2 -1
View File
@@ -824,7 +824,8 @@ public class PersistenceExtensions {
if (firstTimestamp != null) {
BigDecimal totalDuration = BigDecimal.valueOf(Duration.between(firstTimestamp, endTime).toMillis());
return new DecimalType(sum.divide(totalDuration, MathContext.DECIMAL64));
return totalDuration.signum() == 0 ? null
: new DecimalType(sum.divide(totalDuration, MathContext.DECIMAL64));
}
return null;
bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/extensions/PersistenceExtensionsTest.java
+10
View File
@@ -18,6 +18,7 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.closeTo;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -680,6 +681,15 @@ public class PersistenceExtensionsTest {
assertThat(average, is(nullValue()));
}
@Test
public void testAverageBetweenZeroDuration() {
ZonedDateTime now = ZonedDateTime.now();
assertDoesNotThrow(
() -> PersistenceExtensions.averageBetween(quantityItem, now, now, TestPersistenceService.ID));
assertThat(PersistenceExtensions.averageBetween(quantityItem, now, now, TestPersistenceService.ID),
is(nullValue()));
}
@Test
public void testSumSinceDecimalType() {
DecimalType sum = PersistenceExtensions.sumSince(numberItem,