From 429101599efd0514a56887ab9d6a94a670c4beb8 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Fri, 13 Jan 2023 12:50:53 +0100
Subject: [PATCH] fix: Set correct first day of week, fix test accordingly
This setting may differ from machine to machine, so we need
to set it explicitly in order to ensure correct results.
---
.../nibio/vips/model/oatfloweringmodel/OatFloweringModel.java | 1 +
src/test/java/OatFloweringModelTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
index 2948f9b..4991014 100755
--- a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
+++ b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
@@ -122,6 +122,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
private Result initResult(WeatherObservation obs)
{
Calendar cal = Calendar.getInstance();
+ cal.setFirstDayOfWeek(Calendar.MONDAY);
Result result = new ResultImpl();
result.setValidTimeStart(obs.getTimeMeasured());
diff --git a/src/test/java/OatFloweringModelTest.java b/src/test/java/OatFloweringModelTest.java
index c45033c..71e7457 100755
--- a/src/test/java/OatFloweringModelTest.java
+++ b/src/test/java/OatFloweringModelTest.java
@@ -119,7 +119,7 @@ public class OatFloweringModelTest {
System.out.println("Result: [" + result.getValidTimeStart() + "]" + result.getAllValues());
}*/
- assertEquals("27", weekResult);
+ assertEquals("26", weekResult);
assertEquals("60", zReached);
}
--
GitLab