瀏覽代碼

Test other predefined formats. Fix length of format specifiers...

Sam Jaffe 6 年之前
父節點
當前提交
0687a3f31e
共有 2 個文件被更改,包括 14 次插入2 次删除
  1. 2 2
      src/format.cxx
  2. 12 0
      test/format_test.cxx

+ 2 - 2
src/format.cxx

@@ -87,9 +87,9 @@ namespace logging {
     if ( is_string("{ISO8601}")) {
       predef_format = "%%Y-%%m-%%dT%%H:%%M:%%S.%.03dZ";
     } else if (is_string("{ABSOLUTE}")) {
-      predef_format = "%%H:%%M:%%S,%.04d";
+      predef_format = "%%H:%%M:%%S,%.03d";
     } else if (is_string("{DATE}")) {
-      predef_format = "%%d %%b %%Y %%H:%%M:%%S,%.04d";
+      predef_format = "%%d %%b %%Y %%H:%%M:%%S,%.03d";
     } else if (is('{')) {
       return parse_date_format_string(next+1);
     }

+ 12 - 0
test/format_test.cxx

@@ -89,3 +89,15 @@ TEST(FormatTest, SupportsISO8601Format) {
   auto fmt = format::parse_format_string("%d{ISO8601}");
   EXPECT_THAT(fmt.process({{NOW,0}}), Eq("2019-04-04T18:17:20.000Z"));
 }
+
+TEST(FormatTest, SupportsSingleDayFormat) {
+  using testing::Eq;
+  auto fmt = format::parse_format_string("%d{ABSOLUTE}");
+  EXPECT_THAT(fmt.process({{NOW,0}}), Eq("18:17:20,000"));
+}
+
+TEST(FormatTest, SupportsHumanDateFormat) {
+  using testing::Eq;
+  auto fmt = format::parse_format_string("%d{DATE}");
+  EXPECT_THAT(fmt.process({{NOW,0}}), Eq("04 Apr 2019 18:17:20,000"));
+}