Merge pull request #513

Author: KristjanESPERANTO

CHANGELOG.md

@@ -124,7 +124,8 @@ work hours!
 ### Fixed
 
 - fix: add missing `country_code` to `xa.yaml` ([#499](https://github.com/opening-hours/opening_hours.js/pull/499))
-- fix: localize expected test strings for German locale ([#512](https://github.com/opening-hours/opening_hours.js/pull/512))
+- fix(test): localize expected test strings for German locale ([#512](https://github.com/opening-hours/opening_hours.js/pull/512))
+- fix(test): correct two `sunrise` test expectations to match SunCalc output ([#513](https://github.com/opening-hours/opening_hours.js/pull/513))
 
 ### Removed
 

test/test.de.log

@@ -365,32 +365,11 @@ With warnings:
 With warnings:
 	*daylight <--- (Bitte verwende "sunrise-sunset" anstelle von "daylight".)
 "Variable times calculation with coordinates" for "(sunrise+02:00)-sunset": PASSED
-"Variable times which moves over fix end time" for "sunrise-08:02": FAILED, bad duration(s): 1860000,0, expected 1800000,0, bad intervals: 
-[ '2013-01-27 08:01', '2013-01-27 08:02', false, undefined ],
-[ '2013-01-28 08:00', '2013-01-28 08:02', false, undefined ],
-[ '2013-01-29 07:59', '2013-01-29 08:02', false, undefined ],
-[ '2013-01-30 07:58', '2013-01-30 08:02', false, undefined ],
-[ '2013-01-31 07:56', '2013-01-31 08:02', false, undefined ],
-[ '2013-02-01 07:55', '2013-02-01 08:02', false, undefined ],
-[ '2013-02-02 07:54', '2013-02-02 08:02', false, undefined ],
-expected:
-[ '2013-01-28 08:00', '2013-01-28 08:02', false, undefined ],
-[ '2013-01-29 07:59', '2013-01-29 08:02', false, undefined ],
-[ '2013-01-30 07:58', '2013-01-30 08:02', false, undefined ],
-[ '2013-01-31 07:56', '2013-01-31 08:02', false, undefined ],
-[ '2013-02-01 07:55', '2013-02-01 08:02', false, undefined ],
-[ '2013-02-02 07:54', '2013-02-02 08:02', false, undefined ],
+"Variable times which moves over fix end time" for "sunrise-08:02": PASSED
 "Variable times which moves over fix end time" for "sunrise-08:00": PASSED
 "Variable times which moves over fix end time" for "sunrise-07:58": PASSED
 "Variable times which moves over fix end time" for "sunrise-06:00": PASSED
-"Variable times which moves over fix end time" for "sunrise-05:59": FAILED, bad duration(s): 158220000,0, expected 158160000,0, bad intervals: 
-[ '2013-01-26 00:00', '2013-01-26 05:59', false, undefined ],
-[ '2013-01-26 08:01', '2013-01-27 05:59', false, undefined ],
-[ '2013-01-27 08:00', '2013-01-28 00:00', false, undefined ],
-expected:
-[ '2013-01-26 00:00', '2013-01-26 05:59', false, undefined ],
-[ '2013-01-26 08:02', '2013-01-27 05:59', false, undefined ],
-[ '2013-01-27 08:00', '2013-01-28 00:00', false, undefined ],
+"Variable times which moves over fix end time" for "sunrise-05:59": PASSED
 "Variable times which moves over fix end time" for "sunrise-06:00": PASSED
 "Variable times which moves over fix end time" for "sunrise-05:59": IGNORED, reason: not implemented yet
 "Variable times spanning midnight" for "sunset-sunrise": PASSED
@@ -2752,7 +2731,7 @@ Der optional_conf_parm["tag_key"] fehlt, ist aber notwendig wegen optional_conf_
 "Test isEqualTo function" for "Mo 10:00-20:00; We-Fr 10:00-20:01": PASSED
 "Test isEqualTo function" for "Mo 10:00-20:00; We-Fr 10:00-19:59": PASSED
 "Test isEqualTo function" for "closed; Sa unknown "comment"": PASSED
-932/946 tests passed. 14 did not pass.
+934/946 tests passed. 12 did not pass.
 41 tests where (partly) ignored, sorted by commonness:
 * 26: prettifyValue (most of the cases this is used to test if values with selectors in wrong order or wrong symbols (error tolerance) are evaluated correctly)
 * 11: not implemented yet

test/test.en.log

@@ -365,32 +365,11 @@ With warnings:
 With warnings:
 	*daylight <--- (Please use notation "sunrise-sunset" for "daylight".)
 "Variable times calculation with coordinates" for "(sunrise+02:00)-sunset": PASSED
-"Variable times which moves over fix end time" for "sunrise-08:02": FAILED, bad duration(s): 1860000,0, expected 1800000,0, bad intervals: 
-[ '2013-01-27 08:01', '2013-01-27 08:02', false, undefined ],
-[ '2013-01-28 08:00', '2013-01-28 08:02', false, undefined ],
-[ '2013-01-29 07:59', '2013-01-29 08:02', false, undefined ],
-[ '2013-01-30 07:58', '2013-01-30 08:02', false, undefined ],
-[ '2013-01-31 07:56', '2013-01-31 08:02', false, undefined ],
-[ '2013-02-01 07:55', '2013-02-01 08:02', false, undefined ],
-[ '2013-02-02 07:54', '2013-02-02 08:02', false, undefined ],
-expected:
-[ '2013-01-28 08:00', '2013-01-28 08:02', false, undefined ],
-[ '2013-01-29 07:59', '2013-01-29 08:02', false, undefined ],
-[ '2013-01-30 07:58', '2013-01-30 08:02', false, undefined ],
-[ '2013-01-31 07:56', '2013-01-31 08:02', false, undefined ],
-[ '2013-02-01 07:55', '2013-02-01 08:02', false, undefined ],
-[ '2013-02-02 07:54', '2013-02-02 08:02', false, undefined ],
+"Variable times which moves over fix end time" for "sunrise-08:02": PASSED
 "Variable times which moves over fix end time" for "sunrise-08:00": PASSED
 "Variable times which moves over fix end time" for "sunrise-07:58": PASSED
 "Variable times which moves over fix end time" for "sunrise-06:00": PASSED
-"Variable times which moves over fix end time" for "sunrise-05:59": FAILED, bad duration(s): 158220000,0, expected 158160000,0, bad intervals: 
-[ '2013-01-26 00:00', '2013-01-26 05:59', false, undefined ],
-[ '2013-01-26 08:01', '2013-01-27 05:59', false, undefined ],
-[ '2013-01-27 08:00', '2013-01-28 00:00', false, undefined ],
-expected:
-[ '2013-01-26 00:00', '2013-01-26 05:59', false, undefined ],
-[ '2013-01-26 08:02', '2013-01-27 05:59', false, undefined ],
-[ '2013-01-27 08:00', '2013-01-28 00:00', false, undefined ],
+"Variable times which moves over fix end time" for "sunrise-05:59": PASSED
 "Variable times which moves over fix end time" for "sunrise-06:00": PASSED
 "Variable times which moves over fix end time" for "sunrise-05:59": IGNORED, reason: not implemented yet
 "Variable times spanning midnight" for "sunset-sunrise": PASSED
@@ -2745,7 +2724,7 @@ The optional_conf_parm["tag_key"] is missing, required by optional_conf_parm["ma
 "Test isEqualTo function" for "Mo 10:00-20:00; We-Fr 10:00-20:01": PASSED
 "Test isEqualTo function" for "Mo 10:00-20:00; We-Fr 10:00-19:59": PASSED
 "Test isEqualTo function" for "closed; Sa unknown "comment"": PASSED
-925/939 tests passed. 14 did not pass.
+927/939 tests passed. 12 did not pass.
 41 tests where (partly) ignored, sorted by commonness:
 * 26: prettifyValue (most of the cases this is used to test if values with selectors in wrong order or wrong symbols (error tolerance) are evaluated correctly)
 * 11: not implemented yet

test/test.js

@@ -681,13 +681,14 @@ test.addTest('Variable times which moves over fix end time', [
     ], '2013-01-26 0:00', '2013-02-03 0:00', [
         // [ '2013-01-26 08:03', '2013-01-26 08:02' ], // Ignored because it would be interpreted as time range spanning midnight
         // [ '2013-01-27 08:02', '2013-01-27 08:02' ], // which is probably not what you want.
+        [ '2013-01-27 08:01', '2013-01-27 08:02' ],
         [ '2013-01-28 08:00', '2013-01-28 08:02' ],
         [ '2013-01-29 07:59', '2013-01-29 08:02' ],
         [ '2013-01-30 07:58', '2013-01-30 08:02' ],
         [ '2013-01-31 07:56', '2013-01-31 08:02' ],
         [ '2013-02-01 07:55', '2013-02-01 08:02' ],
         [ '2013-02-02 07:54', '2013-02-02 08:02' ],
-    ], 1000 * 60 * (6 * 2 + 1 + 2 + 4 + 5 + 6), 0, false, nominatim_default);
+    ], 1000 * 60 * (1 + 2 + 3 + 4 + 6 + 7 + 8), 0, false, nominatim_default);
 
 test.addTest('Variable times which moves over fix end time', [
         'sunrise-08:00',
@@ -717,9 +718,9 @@ test.addTest('Variable times which moves over fix end time', [
         'sunrise-05:59', // end time < constant time < from time
     ], '2013-01-26 0:00', '2013-01-28 0:00', [
     [ '2013-01-26 00:00', '2013-01-26 05:59' ],
-    [ '2013-01-26 08:02', '2013-01-27 05:59' ],
+    [ '2013-01-26 08:01', '2013-01-27 05:59' ],
     [ '2013-01-27 08:00', '2013-01-28 00:00' ],
-    ], 1000 * 60 * ((60 * 5 + 59) + (60 * 22 - 3) + (60 * 16)), 0, false, nominatim_default, 'not last test');
+    ], 1000 * 60 * ((60 * 5 + 59) + (60 * 22 - 2) + (60 * 16)), 0, false, nominatim_default, 'not last test');
 
 test.addTest('Variable times which moves over fix end time', [
         'sunrise-06:00', // from time < constant time <= end time