From b871f8f0e0ed4c244d36e4a9b5dc78b2d7e48bf0 Mon Sep 17 00:00:00 2001 From: ador Date: Mon, 16 Sep 2024 07:57:44 +0200 Subject: [PATCH] fix formatting --- src/jsone_encode.erl | 8 +++++--- test/jsone_decode_tests.erl | 3 ++- test/jsone_encode_tests.erl | 23 +++++++++++------------ test/test_time_module.erl | 8 ++++++-- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/jsone_encode.erl b/src/jsone_encode.erl index f2e63bf..ef5d958 100644 --- a/src/jsone_encode.erl +++ b/src/jsone_encode.erl @@ -603,14 +603,16 @@ local_offset() -> Local = calendar:universal_time_to_local_time({{1970, 1, 2}, {0, 0, 0}}), calendar:datetime_to_gregorian_seconds(Local) - calendar:datetime_to_gregorian_seconds(UTC). + -ifndef(TIME_MODULE). -define(TIME_MODULE, erlang). -endif. --spec local_offset_dst () -> jsone:utc_offset_seconds(). + +-spec local_offset_dst() -> jsone:utc_offset_seconds(). local_offset_dst() -> LocalDateTime = ?TIME_MODULE:localtime(), - calendar:datetime_to_gregorian_seconds(LocalDateTime) - - calendar:datetime_to_gregorian_seconds(?TIME_MODULE:localtime_to_universaltime(LocalDateTime)). + calendar:datetime_to_gregorian_seconds(LocalDateTime) - + calendar:datetime_to_gregorian_seconds(?TIME_MODULE:localtime_to_universaltime(LocalDateTime)). diff --git a/test/jsone_decode_tests.erl b/test/jsone_decode_tests.erl index cf1bf60..83b8a81 100644 --- a/test/jsone_decode_tests.erl +++ b/test/jsone_decode_tests.erl @@ -43,7 +43,8 @@ decode_test_() -> ?assertEqual({ok, 0, <<"1">>}, jsone_decode:decode(<<"-01">>)) end}, {"integer can't begin with an explicit plus sign", - fun() -> ?assertMatch({error, {badarg, _}}, jsone_decode:decode(<<"+1">>)) end}, + fun() -> ?assertMatch({error, {badarg, _}}, jsone_decode:decode(<<"+1">>)) + end}, %% Numbers: Floats {"float: decimal notation", fun() -> ?assertEqual({ok, 1.23, <<"">>}, jsone_decode:decode(<<"1.23">>)) end}, diff --git a/test/jsone_encode_tests.erl b/test/jsone_encode_tests.erl index b256b12..7e97dc3 100644 --- a/test/jsone_encode_tests.erl +++ b/test/jsone_encode_tests.erl @@ -141,22 +141,21 @@ encode_test_() -> end end}, {"datetime: iso8601: local with daylight saving variable zone - summer time (2h offset)", - fun() -> - test_time_module:set_localtime({{2024, 9, 15},{11, 00, 00}}), - test_time_module:mock_localtime_to_universaltime(fun(_) -> {{2024, 9, 15},{9, 00, 00}} end), + fun() -> + test_time_module:set_localtime({{2024, 9, 15}, {11, 00, 00}}), + test_time_module:mock_localtime_to_universaltime(fun(_) -> {{2024, 9, 15}, {9, 00, 00}} end), - {ok, Json} = jsone_encode:encode({{2015, 6, 25}, {14, 57, 25}}, [{datetime_format, {iso8601, local_dst}}]), - ?assertMatch(<<"\"2015-06-25T14:57:25+02:00\"">>, Json) + {ok, Json} = jsone_encode:encode({{2015, 6, 25}, {14, 57, 25}}, [{datetime_format, {iso8601, local_dst}}]), + ?assertMatch(<<"\"2015-06-25T14:57:25+02:00\"">>, Json) end}, {"datetime: iso8601: local with daylight saving variable zone - winter time (1h offset)", - fun() -> - test_time_module:set_localtime({{2024, 12, 15},{11, 00, 00}}), - test_time_module:mock_localtime_to_universaltime(fun(_) -> {{2024, 12, 15},{10, 00, 00}} end), + fun() -> + test_time_module:set_localtime({{2024, 12, 15}, {11, 00, 00}}), + test_time_module:mock_localtime_to_universaltime(fun(_) -> {{2024, 12, 15}, {10, 00, 00}} end), - {ok, Json} = jsone_encode:encode({{2015, 6, 25}, {14, 57, 25}}, [{datetime_format, {iso8601, local_dst}}]), - ?assertMatch(<<"\"2015-06-25T14:57:25+01:00\"">>, Json) - end - }, + {ok, Json} = jsone_encode:encode({{2015, 6, 25}, {14, 57, 25}}, [{datetime_format, {iso8601, local_dst}}]), + ?assertMatch(<<"\"2015-06-25T14:57:25+01:00\"">>, Json) + end}, {"datetime: iso8601: timezone", fun() -> ?assertEqual({ok, <<"\"2015-06-25T14:57:25Z\"">>}, diff --git a/test/test_time_module.erl b/test/test_time_module.erl index 4143448..d81608e 100644 --- a/test/test_time_module.erl +++ b/test/test_time_module.erl @@ -1,15 +1,19 @@ -module(test_time_module). -export([localtime/0, set_localtime/1, localtime_to_universaltime/1, mock_localtime_to_universaltime/1]). -set_localtime({{_,_,_}, {_,_,_}} = LocalTime) -> + +set_localtime({{_, _, _}, {_, _, _}} = LocalTime) -> erlang:put('__test_time_module__localtime__', LocalTime). + localtime() -> erlang:get('__test_time_module__localtime__'). -localtime_to_universaltime({{_,_,_}, {_,_,_}} = LocalTime) -> + +localtime_to_universaltime({{_, _, _}, {_, _, _}} = LocalTime) -> LocalTimeToUniversalTimeFun = erlang:get('__test_time_module_localtime_to_universaltime__'), LocalTimeToUniversalTimeFun(LocalTime). + mock_localtime_to_universaltime(Fun) when is_function(Fun) -> erlang:put('__test_time_module_localtime_to_universaltime__', Fun).