This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
On 3/28/19 12:23 AM, DJ Delorie wrote:
Test the transition points between all the currently listed Japanese era name changes. This includes testing the transition between the first year date and the second year date. This test will help test the upcoming Japanese era name change. Also fixes a fencepost error where the era name isn't properly parsed by strptime in the last (partial) year of the era.
Thank you for creating this test case to help cover the Japanese era name change! Thank you also for finding and fixing a bug. Comments below. Looking forward to v2.
2019-03-28 DJ Delorie <dj@redhat.com> [BZ #24394] * time/strptime_l.c (%Ey): Fix fencepost error. * time/tst-strftime3.c: New. * time/Makefile (tests): Add tst-strftime3. diff --git a/time/Makefile b/time/Makefile index 5c6304ece1..2ca206309d 100644 --- a/time/Makefile +++ b/time/Makefile @@ -43,7 +43,7 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \ tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ - tst-tzname tst-y2039 bug-mktime4 tst-strftime2 + tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3
OK. ja_JP.* is already in test locales so this is OK.
include ../Rules diff --git a/time/strptime_l.c b/time/strptime_l.cindex e19b9a15dd..fb90bd2773 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -909,7 +909,8 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp, * era->absolute_direction); match = (delta >= 0 && delta < (((int64_t) era->stop_date[0] - - (int64_t) era->start_date[0]) + - (int64_t) era->start_date[0] + + 1)
Why? Please explain this change in detail with examples in a new commit message. Make it easy for the reviewer to give you an A.
* era->absolute_direction)); } if (! match) diff --git a/time/tst-strftime3.c b/time/tst-strftime3.c new file mode 100644 index 0000000000..0b5ccaed9b --- /dev/null +++ b/time/tst-strftime3.c @@ -0,0 +1,204 @@ +/* Test for strftime, esp Japenese era name changes.
OK.
+ Copyright (C) 2019 Free Software Foundation, Inc.
OK.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <locale.h>
+#include <support/check.h>
+#include <array_length.h>
+
+/* These exist for the convenience of writing the test data, because
+ zero-based vs one-based. */
+typedef enum {
+ Sun, Mon, Tue, Wed, Thu, Fri, Sat
+} WeekDay;
+
+typedef enum {
+ Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec
+} Month;
+
+typedef struct Data {
+ /* A descriptive name of the test. */
+ const char *name;
+
+ /* The specific date and time to be tested. */
+ int y, m, d;
+ WeekDay w;
+ int hh, mm, ss;
+
+ /* The locale under which the conversion is done. */
+ const char *locale;
+
+ /* Format passed to strftime. */
+ const char *format;
+
+ /* Expected data, NUL terminated. */
+ const char *printed;
+
+ int test_strptime_too;
+
+} Data;
+
+/* Notes: years are full 4-digit years, the code compensates. */
+const Data data[] = {
+ { "Baseline test",
+ 2019, Mar, 27, Wed, 14, 3, 22, "en_US.ISO-8859-1",
+ "%Y-%m-%d %T", "2019-03-27 14:03:22", 1 },
+
Please add transitions to cover all entries in localedata/localse/ja_JP.
+
+ { "Japanese era change, 1926, before first transition's year",
+ 1925, Dec, 31, Thu, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\345\244\247\346\255\24314\345\271\264", 1 },
I'm not happy to see explicitly written out binary mbcs data here. However, if we don't do this then we can't support multiple encodings in one test file because the editor might display the data oddly or even write out the wrong thing. Two options (a) Explicit code points. I would like to see something like this: "<U5E73><U6210>3<U5E74>" Which is then converted by the test framework into the output encoding. To do that you'd need to: * Convert <Uxxxx> entries into wchar_t, fairly easy, you just parse the number and that's the value of the wchar_t. * Parse non-<Uxxxx> as ASCII and stuff into wchar_t also. * Use wcsrtombs to convert (according to current locale). Then compare to the generated string. This would make it much easier to maintain these in the long run. Yes, what you have right now gives test independence from any self-consistent errors in wcsrtombs. (b) Explain how to convert back and forth. Explain how you generated these values and give examples for converting back and forth between the values here and a readable string so future developers can do the same. Feel free to use echo -ne, or xxd, or od, or iconv.
+ { "Japanese era change, 1926, start of first transition's year",
+ 1926, Jan, 1, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\345\244\247\346\255\24315\345\271\264", 1 },
These should be \x hex escape sequnces because they then match the output from the charmap data (if you choose option (b) above), which makes it easier to double check output.
+
+ { "Japanese era change, 1926, before first transition",
+ 1926, Dec, 24, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\345\244\247\346\255\24315\345\271\264", 1 },
+ { "Japanese era change, 1926, after first transition",
+ 1926, Dec, 25, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\346\230\255\345\222\214\345\205\203\345\271\264", 1 },
+
+ { "Japanese era change, 1926, before end transition year",
+ 1926, Dec, 31, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\346\230\255\345\222\214\345\205\203\345\271\264", 1 },
+ { "Japanese era change, 1926, after transition year",
+ 1927, Jan, 1, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\346\230\255\345\222\21402\345\271\264", 1 },
+
+
+ { "Japanese era change, 1989, before first transition's year",
+ 1988, Dec, 31, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\346\230\255\345\222\21463\345\271\264", 1 },
+ { "Japanese era change, 1989, start of first transition's year",
+ 1989, Jan, 1, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\346\230\255\345\222\21464\345\271\264", 1 },
+
+ { "Japanese era change, 1989, before first transition",
+ 1989, Jan, 7, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\346\230\255\345\222\21464\345\271\264", 0 },
+ { "Japanese era change, 1989, after first transition",
+ 1989, Jan, 8, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\345\271\263\346\210\220\345\205\203\345\271\264", 1 },
+ { "Japanese era change, 1989, end transition year",
+ 1989, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\345\271\263\346\210\220\345\205\203\345\271\264", 1 },
+ { "Japanese era change, 1989, after transition year",
+ 1990, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ "\345\271\263\346\210\22002\345\271\264", 1 },
+
+ { "Japanese era change, 1989, before first transition",
+ 1989, Jan, 7, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ "\276\274\317\30264\307\257", 0 },
+ { "Japanese era change, 1989, after first transition",
+ 1989, Jan, 8, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ "\312\277\300\256\270\265\307\257", 1 },
+ { "Japanese era change, 1989, end transition year",
+ 1989, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ "\312\277\300\256\270\265\307\257", 1 },
+ { "Japanese era change, 1989, after transition year",
+ 1990, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ "\312\277\300\25602\307\257", 1 },
+};
+
+#define NDATA array_length(data)
+
+/* Size of buffer passed to strftime. */
+#define STRBUFLEN 1000
+/* Size of buffer passed to tm_to_printed. */
+#define TMBUFLEN 50
+
+/* Helper function to create a printable version of struct tm. */
+static void
+tm_to_printed (struct tm *tm, char *buffer)
+{
+ snprintf (buffer, TMBUFLEN, "%04d/%02d/%02d-%02d:%02d:%02d-%d",
+ tm->tm_year,
+ tm->tm_mon,
+ tm->tm_mday,
+ tm->tm_hour,
+ tm->tm_min,
+ tm->tm_sec,
+ tm->tm_wday);
+}
OK.
+
+static int
+do_test (void)
+{
+ int i;
+ char buffer[STRBUFLEN];
+ char buf1[TMBUFLEN];
+ char buf2[TMBUFLEN];
+
+ for (i = 0; i < NDATA; i ++)
+ {
+ const Data *d = &(data[i]);
+ struct tm tm;
+ struct tm tm2;
+ size_t rv;
+ char *rvp;
+
+ /* Print this just to help debug failures. */
+ printf("\n%s: %s %s %s\n", d->name, d->locale, d->format, d->printed);
+
+ tm.tm_year = d->y - 1900;
+ tm.tm_mon = d->m;
+ tm.tm_mday = d->d;
+ tm.tm_wday = d->w;
+ tm.tm_hour = d->hh;
+ tm.tm_min = d->mm;
+ tm.tm_sec = d->ss;
+ tm.tm_isdst = -1;
+
+ /* LC_ALL may interfere with the snprintf in tm_to_printed. */
+ if (setlocale (LC_TIME, d->locale) == NULL)
+ {
+ /* See the LOCALES list in the Makefile. */
+ printf ("locale %s does not exist!\n", d->locale);
+ exit (EXIT_FAILURE);
+ }
OK.
+ + rv = strftime (buffer, sizeof(buffer), d->format, &tm); + + TEST_COMPARE (rv, strlen (d->printed)); + TEST_COMPARE_STRING (buffer, d->printed); + + /* Copy the original time, so that any fields not affected by + the call to strptime() will match. */ + tm2 = tm; + + rvp = strptime (d->printed, d->format, &tm2); + + /* Not all conversions are reversible. */
Why? All of them should be reversible. You fixed the bug that made them not reversible?
+ if (d->test_strptime_too)
+ {
+ TEST_COMPARE_STRING (rvp, "");
+
+ tm_to_printed (&tm, buf1);
+ tm_to_printed (&tm2, buf2);
+ TEST_COMPARE_STRING (buf1, buf2);
+ }
+ }
+
+ return 0;
+}
+
+#include <support/test-driver.c>
-- Cheers, Carlos.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |