From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id DF9F56EC55; Thu, 29 Jul 2021 21:56:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DF9F56EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627584990; bh=uyov9yO4pBXxP97U3OKzgA+4HX4JydhDiFDWe66F+B8=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=WsVCTxJOu5vCLyds3qnS5zCDpq+gDLI1bzoMITTC8uUBfQCPFJkGbspyQ7MK6mKFy nUX9gEMhJxCAtrJbYiXtcqDFX1CW44UAjPbF1cyYpjJMfSZdmiPGd6WV7jJ8VmMrO7 GTyr3Y36NkLZGV0yyiZUVunT9byov77OpITQjMP4= Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [94.100.177.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 84A1C6EC55 for ; Thu, 29 Jul 2021 21:55:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 84A1C6EC55 Received: by smtp52.i.mail.ru with esmtpa (envelope-from ) id 1m9BC4-0005y6-Jy; Thu, 29 Jul 2021 21:55:45 +0300 To: Timur Safin , v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <76ae95a7c49c1c981a726b59f24a2f524b256880.1627468002.git.tsafin@tarantool.org> Message-ID: <89450197-1b62-9bd6-0b61-8ae99b3538ff@tarantool.org> Date: Thu, 29 Jul 2021 21:55:44 +0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <76ae95a7c49c1c981a726b59f24a2f524b256880.1627468002.git.tsafin@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD941C43E597735A9C354866C15C72ED952BE56FFA0EFAF5B8C182A05F538085040EED9967B20D9BC26190E45DECA17268A3586651361FB507E46B468D70C4A5239 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77AA33865E80AF043EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637575C0790A70C4B158638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B3670F2AA693AF0CA21CB1D9A8D681D3117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE4B6963042765DA4B0CB8D3112395442FD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3A7DFDF579AB090EF6136E347CC761E07C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637B8F435DEDE9E76EBEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79DB53CE84373687089ECE8A345E871A837 X-C1DE0DAB: 0D63561A33F958A59B5F946F98538222208CA5BE47B77032F294C60689028722D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753530422897FB34C3410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A541DB4061E938329F5E149F287CD4E6D278DC7F12C6E4BF9601C0E1DDA356D864898A9C1DA8E0261D7E09C32AA3244C1C1100906B06EC4F1FAC2A50FFFCE9D0D08D48398F32B4A6FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojPp/mPgZxawEjzVCHt7XJUw== X-Mailru-Sender: 583F1D7ACE8F49BD1042885CEC987B6B8305DD6F4F1A1977190E45DECA17268A0D95629463F16A6A7019711D9D5B048E1458020726E2BC9FD5ECBA0B92C0A936CDC7563AA7CEBD287402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH resend v2 03/11] lua, datetime: datetime tests X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Oleg Babin via Tarantool-patches Reply-To: Oleg Babin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for your patch. To be honest I don't understand the structure of this changes. I expect that "datetime tests" will contain only tests. All unrelated to tests changes should be squashed to the previous patch. I put several comments below. On 28.07.2021 13:34, Timur Safin via Tarantool-patches wrote: > * created app-tap test for new builtin module `datetime.lua` > * added case to check datetime string formatting using: > - asctime (gmt time); > - ctime (local TZ time); > - strftime (using given format). > > * added positive/negative checks to datetime test > - extended api of datetime.parse_date, .parse_time, .parse_time_zone > with a length of parsed (sub)string; > - this allows us to check partially valid strings like "20121224 Foo bar". > > Part of #5941 > --- > src/lua/datetime.lua | 14 ++- > test/app-tap/datetime.test.lua | 191 +++++++++++++++++++++++++++++++++ > 2 files changed, 197 insertions(+), 8 deletions(-) > create mode 100755 test/app-tap/datetime.test.lua > > diff --git a/src/lua/datetime.lua b/src/lua/datetime.lua > index 0996ca5a2..f4d2d7737 100644 > --- a/src/lua/datetime.lua > +++ b/src/lua/datetime.lua > @@ -318,7 +318,7 @@ local function datetime_new(o) > end, > > month = function(v) > - assert(v > 0 and v < 12 ) > + assert(v > 0 and v < 13 ) > M = v > ymd = true > end, > @@ -393,9 +393,8 @@ end > > local function parse_date(str) > local dt = ffi.new('dt_t[1]') > - local rc = cdt.dt_parse_iso_date(str, #str, dt) > - assert(rc > 0) > - return mk_timestamp(dt[0]) > + local len = cdt.dt_parse_iso_date(str, #str, dt) > + return len > 0 and mk_timestamp(dt[0]) or nil, tonumber(len) > end > > --[[ > @@ -411,9 +410,8 @@ end > local function parse_time(str) > local sp = ffi.new('int[1]') > local fp = ffi.new('int[1]') > - local rc = cdt.dt_parse_iso_time(str, #str, sp, fp) > - assert(rc > 0) > - return mk_timestamp(nil, sp[0], fp[0]) > + local len = cdt.dt_parse_iso_time(str, #str, sp, fp) > + return len > 0 and mk_timestamp(nil, sp[0], fp[0]) or nil, tonumber(len) > end > > --[[ > @@ -448,7 +446,7 @@ local function parse_str(str) > str = str:sub(tonumber(n) + 1) > > local ch = str:sub(1,1) > - if ch ~= 't' and ch ~= 'T' and ch ~= ' ' then > + if ch:match('[Tt ]') == nil then > return mk_timestamp(dt_) > end > > diff --git a/test/app-tap/datetime.test.lua b/test/app-tap/datetime.test.lua > new file mode 100755 > index 000000000..09c968858 > --- /dev/null > +++ b/test/app-tap/datetime.test.lua > @@ -0,0 +1,191 @@ > +#!/usr/bin/env tarantool > + > +local tap = require('tap') > +local test = tap.test("errno") > +local date = require('datetime') > + > +test:plan(5) > + > +test:test("Simple tests for parser", function(test) > + test:plan(2) > + test:ok(date("1970-01-01T01:00:00Z") == > + date {year=1970, month=1, day=1, hour=1, minute=0, second=0}) > + test:ok(date("1970-01-01T02:00:00+02:00") == > + date {year=1970, month=1, day=1, hour=2, minute=0, second=0, tz=120}) > +end) > + > +test:test("Multiple tests for parser (with nanoseconds)", function(test) > + test:plan(165) > + -- borrowed from p5-time-moments/t/180_from_string.t > + local tests = > + { > + { '1970-01-01T00:00:00Z', 0, 0, 0 }, > + { '1970-01-01T02:00:00+02:00', 0, 0, 120 }, > + { '1970-01-01T01:30:00+01:30', 0, 0, 90 }, > + { '1970-01-01T01:00:00+01:00', 0, 0, 60 }, > + { '1970-01-01T00:01:00+00:01', 0, 0, 1 }, > + { '1970-01-01T00:00:00+00:00', 0, 0, 0 }, > + { '1969-12-31T23:59:00-00:01', 0, 0, -1 }, > + { '1969-12-31T23:00:00-01:00', 0, 0, -60 }, > + { '1969-12-31T22:30:00-01:30', 0, 0, -90 }, > + { '1969-12-31T22:00:00-02:00', 0, 0, -120 }, > + { '1970-01-01T00:00:00.123456789Z', 0, 123456789, 0 }, > + { '1970-01-01T00:00:00.12345678Z', 0, 123456780, 0 }, > + { '1970-01-01T00:00:00.1234567Z', 0, 123456700, 0 }, > + { '1970-01-01T00:00:00.123456Z', 0, 123456000, 0 }, > + { '1970-01-01T00:00:00.12345Z', 0, 123450000, 0 }, > + { '1970-01-01T00:00:00.1234Z', 0, 123400000, 0 }, > + { '1970-01-01T00:00:00.123Z', 0, 123000000, 0 }, > + { '1970-01-01T00:00:00.12Z', 0, 120000000, 0 }, > + { '1970-01-01T00:00:00.1Z', 0, 100000000, 0 }, > + { '1970-01-01T00:00:00.01Z', 0, 10000000, 0 }, > + { '1970-01-01T00:00:00.001Z', 0, 1000000, 0 }, > + { '1970-01-01T00:00:00.0001Z', 0, 100000, 0 }, > + { '1970-01-01T00:00:00.00001Z', 0, 10000, 0 }, > + { '1970-01-01T00:00:00.000001Z', 0, 1000, 0 }, > + { '1970-01-01T00:00:00.0000001Z', 0, 100, 0 }, > + { '1970-01-01T00:00:00.00000001Z', 0, 10, 0 }, > + { '1970-01-01T00:00:00.000000001Z', 0, 1, 0 }, > + { '1970-01-01T00:00:00.000000009Z', 0, 9, 0 }, > + { '1970-01-01T00:00:00.00000009Z', 0, 90, 0 }, > + { '1970-01-01T00:00:00.0000009Z', 0, 900, 0 }, > + { '1970-01-01T00:00:00.000009Z', 0, 9000, 0 }, > + { '1970-01-01T00:00:00.00009Z', 0, 90000, 0 }, > + { '1970-01-01T00:00:00.0009Z', 0, 900000, 0 }, > + { '1970-01-01T00:00:00.009Z', 0, 9000000, 0 }, > + { '1970-01-01T00:00:00.09Z', 0, 90000000, 0 }, > + { '1970-01-01T00:00:00.9Z', 0, 900000000, 0 }, > + { '1970-01-01T00:00:00.99Z', 0, 990000000, 0 }, > + { '1970-01-01T00:00:00.999Z', 0, 999000000, 0 }, > + { '1970-01-01T00:00:00.9999Z', 0, 999900000, 0 }, > + { '1970-01-01T00:00:00.99999Z', 0, 999990000, 0 }, > + { '1970-01-01T00:00:00.999999Z', 0, 999999000, 0 }, > + { '1970-01-01T00:00:00.9999999Z', 0, 999999900, 0 }, > + { '1970-01-01T00:00:00.99999999Z', 0, 999999990, 0 }, > + { '1970-01-01T00:00:00.999999999Z', 0, 999999999, 0 }, > + { '1970-01-01T00:00:00.0Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.00Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.000Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.0000Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.00000Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.000000Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.0000000Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.00000000Z', 0, 0, 0 }, > + { '1970-01-01T00:00:00.000000000Z', 0, 0, 0 }, > + { '1973-11-29T21:33:09Z', 123456789, 0, 0 }, > + { '2013-10-28T17:51:56Z', 1382982716, 0, 0 }, > + -- { '9999-12-31T23:59:59Z', 253402300799, 0, 0 }, Why is it commented? > + } > + for _, value in ipairs(tests) do > + local str, epoch, nsec, offset > + str, epoch, nsec, offset = unpack(value) > + local dt = date(str) > + test:ok(dt.secs == epoch, ('%s: dt.secs == %d'):format(str, epoch)) > + test:ok(dt.nsec == nsec, ('%s: dt.nsec == %d'):format(str, nsec)) > + test:ok(dt.offset == offset, ('%s: dt.offset == %d'):format(str, offset)) > + end > +end) > + > +local ffi = require('ffi') > + > +ffi.cdef [[ > + void tzset(void); > +]] > + It's probably better to require all modules at the top of the file. > +test:test("Datetime string formatting", function(test) > + test:plan(7) > + local str = "1970-01-01" > + local t = date(str) > + test:ok(t.secs == 0, ('%s: t.secs == %d'):format(str, tonumber(t.secs))) > + test:ok(t.nsec == 0, ('%s: t.nsec == %d'):format(str, t.nsec)) > + test:ok(t.offset == 0, ('%s: t.offset == %d'):format(str, t.offset)) > + test:ok(date.asctime(t) == 'Thu Jan 1 00:00:00 1970\n', ('%s: asctime'):format(str)) > + -- ctime() is local timezone dependent. To make sure that > + -- test is deterministic we enforce timezone via TZ environment > + -- manipulations and calling tzset() > + > + -- redefine timezone to be always GMT-2 > + os.setenv('TZ', 'GMT-2') > + ffi.C.tzset() > + test:ok(date.ctime(t) == 'Thu Jan 1 02:00:00 1970\n', ('%s: ctime with timezone'):format(str)) > + test:ok(date.strftime('%d/%m/%Y', t) == '01/01/1970', ('%s: strftime #1'):format(str)) > + test:ok(date.strftime('%A %d. %B %Y', t) == 'Thursday 01. January 1970', ('%s: strftime #2'):format(str)) > +end) > + > +test:test("Parse iso date - valid strings", function(test) > + test:plan(32) > + local good = { > + {2012, 12, 24, "20121224", 8 }, > + {2012, 12, 24, "20121224 Foo bar", 8 }, > + {2012, 12, 24, "2012-12-24", 10 }, > + {2012, 12, 24, "2012-12-24 23:59:59", 10 }, > + {2012, 12, 24, "2012-12-24T00:00:00+00:00", 10 }, > + {2012, 12, 24, "2012359", 7 }, > + {2012, 12, 24, "2012359T235959+0130", 7 }, > + {2012, 12, 24, "2012-359", 8 }, > + {2012, 12, 24, "2012W521", 8 }, > + {2012, 12, 24, "2012-W52-1", 10 }, > + {2012, 12, 24, "2012Q485", 8 }, > + {2012, 12, 24, "2012-Q4-85", 10 }, > + { 1, 1, 1, "0001-Q1-01", 10 }, > + { 1, 1, 1, "0001-W01-1", 10 }, > + { 1, 1, 1, "0001-01-01", 10 }, > + { 1, 1, 1, "0001-001", 8 }, > + } > + > + for _, value in ipairs(good) do > + local year, month, day, str, date_part_len; I didn't see before that somebody uses semicolon after variables definition. It's about code-style. It is clear that this is syntactically correct. > + year, month, day, str, date_part_len = unpack(value) > + local expected_date = date{year = year, month = month, day = day} > + local date_part, len > + date_part, len = date.parse_date(str) > + test:ok(len == date_part_len, ('%s: length check %d'):format(str, len)) > + test:ok(expected_date == date_part, ('%s: expected date'):format(str)) > + end > +end) > + > +test:test("Parse iso date - invalid strings", function(test) > + test:plan(62) > + local bad = { > + "20121232" , -- Invalid day of month > + "2012-12-310", -- Invalid day of month > + "2012-13-24" , -- Invalid month > + "2012367" , -- Invalid day of year > + "2012-000" , -- Invalid day of year > + "2012W533" , -- Invalid week of year > + "2012-W52-8" , -- Invalid day of week > + "2012Q495" , -- Invalid day of quarter > + "2012-Q5-85" , -- Invalid quarter > + "20123670" , -- Trailing digit > + "201212320" , -- Trailing digit > + "2012-12" , -- Reduced accuracy > + "2012-Q4" , -- Reduced accuracy > + "2012-Q42" , -- Invalid > + "2012-Q1-1" , -- Invalid day of quarter > + "2012Q--420" , -- Invalid > + "2012-Q-420" , -- Invalid > + "2012Q11" , -- Incomplete > + "2012Q1234" , -- Trailing digit > + "2012W12" , -- Incomplete > + "2012W1234" , -- Trailing digit > + "2012W-123" , -- Invalid > + "2012-W12" , -- Incomplete > + "2012-W12-12", -- Trailing digit > + "2012U1234" , -- Invalid > + "2012-1234" , -- Invalid > + "2012-X1234" , -- Invalid > + "0000-Q1-01" , -- Year less than 0001 > + "0000-W01-1" , -- Year less than 0001 > + "0000-01-01" , -- Year less than 0001 > + "0000-001" , -- Year less than 0001 > + } > + > + for _, str in ipairs(bad) do > + local date_part, len > + date_part, len = date.parse_date(str) > + test:ok(len == 0, ('%s: length check %d'):format(str, len)) > + test:ok(date_part == nil, ('%s: empty date check %s'):format(str, date_part)) > + end > +end) > + > +os.exit(test:check() and 0 or 1)