Merge time-test into chrono-test

test/CMakeLists.txt

@@ -99,7 +99,6 @@ add_fmt_test(locale-test)
 add_fmt_test(ostream-test)
 add_fmt_test(prepare-test)
 add_fmt_test(printf-test)
-add_fmt_test(time-test)
 add_fmt_test(custom-formatter-test)
 add_fmt_test(ranges-test)
 

test/chrono-test.cc

@@ -5,6 +5,10 @@
 //
 // For the license information refer to format.h.
 
+#ifdef WIN32
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
+
 #include "fmt/chrono.h"
 #include "gtest-extra.h"
 
@@ -43,6 +47,53 @@ std::string format_tm(const std::tm& time, const char* spec,
   return os.str();
 }
 
+TEST(TimeTest, Format) {
+  std::tm tm = std::tm();
+  tm.tm_year = 116;
+  tm.tm_mon = 3;
+  tm.tm_mday = 25;
+  EXPECT_EQ("The date is 2016-04-25.",
+            fmt::format("The date is {:%Y-%m-%d}.", tm));
+}
+
+TEST(TimeTest, GrowBuffer) {
+  std::string s = "{:";
+  for (int i = 0; i < 30; ++i) s += "%c";
+  s += "}\n";
+  std::time_t t = std::time(FMT_NULL);
+  fmt::format(s, *std::localtime(&t));
+}
+
+TEST(TimeTest, FormatToEmptyContainer) {
+  std::string s;
+  auto time = std::tm();
+  time.tm_sec = 42;
+  fmt::format_to(std::back_inserter(s), "{:%S}", time);
+  EXPECT_EQ(s, "42");
+}
+
+TEST(TimeTest, EmptyResult) { EXPECT_EQ("", fmt::format("{}", std::tm())); }
+
+static bool EqualTime(const std::tm& lhs, const std::tm& rhs) {
+  return lhs.tm_sec == rhs.tm_sec && lhs.tm_min == rhs.tm_min &&
+         lhs.tm_hour == rhs.tm_hour && lhs.tm_mday == rhs.tm_mday &&
+         lhs.tm_mon == rhs.tm_mon && lhs.tm_year == rhs.tm_year &&
+         lhs.tm_wday == rhs.tm_wday && lhs.tm_yday == rhs.tm_yday &&
+         lhs.tm_isdst == rhs.tm_isdst;
+}
+
+TEST(TimeTest, LocalTime) {
+  std::time_t t = std::time(FMT_NULL);
+  std::tm tm = *std::localtime(&t);
+  EXPECT_TRUE(EqualTime(tm, fmt::localtime(t)));
+}
+
+TEST(TimeTest, GMTime) {
+  std::time_t t = std::time(FMT_NULL);
+  std::tm tm = *std::gmtime(&t);
+  EXPECT_TRUE(EqualTime(tm, fmt::gmtime(t)));
+}
+
 #define EXPECT_TIME(spec, time, duration)                 \
   {                                                       \
     std::locale loc("ja_JP.utf8");                        \

test/time-test.cc

@@ -1,61 +0,0 @@
-// Formatting library for C++ - time formatting tests
-//
-// Copyright (c) 2012 - present, Victor Zverovich
-// All rights reserved.
-//
-// For the license information refer to format.h.
-
-#ifdef WIN32
-#  define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "fmt/chrono.h"
-#include "fmt/locale.h"
-#include "gmock.h"
-
-TEST(TimeTest, Format) {
-  std::tm tm = std::tm();
-  tm.tm_year = 116;
-  tm.tm_mon = 3;
-  tm.tm_mday = 25;
-  EXPECT_EQ("The date is 2016-04-25.",
-            fmt::format("The date is {:%Y-%m-%d}.", tm));
-}
-
-TEST(TimeTest, GrowBuffer) {
-  std::string s = "{:";
-  for (int i = 0; i < 30; ++i) s += "%c";
-  s += "}\n";
-  std::time_t t = std::time(FMT_NULL);
-  fmt::format(s, *std::localtime(&t));
-}
-
-TEST(TimeTest, FormatToEmptyContainer) {
-  std::string s;
-  auto time = std::tm();
-  time.tm_sec = 42;
-  fmt::format_to(std::back_inserter(s), "{:%S}", time);
-  EXPECT_EQ(s, "42");
-}
-
-TEST(TimeTest, EmptyResult) { EXPECT_EQ("", fmt::format("{}", std::tm())); }
-
-static bool EqualTime(const std::tm& lhs, const std::tm& rhs) {
-  return lhs.tm_sec == rhs.tm_sec && lhs.tm_min == rhs.tm_min &&
-         lhs.tm_hour == rhs.tm_hour && lhs.tm_mday == rhs.tm_mday &&
-         lhs.tm_mon == rhs.tm_mon && lhs.tm_year == rhs.tm_year &&
-         lhs.tm_wday == rhs.tm_wday && lhs.tm_yday == rhs.tm_yday &&
-         lhs.tm_isdst == rhs.tm_isdst;
-}
-
-TEST(TimeTest, LocalTime) {
-  std::time_t t = std::time(FMT_NULL);
-  std::tm tm = *std::localtime(&t);
-  EXPECT_TRUE(EqualTime(tm, fmt::localtime(t)));
-}
-
-TEST(TimeTest, GMTime) {
-  std::time_t t = std::time(FMT_NULL);
-  std::tm tm = *std::gmtime(&t);
-  EXPECT_TRUE(EqualTime(tm, fmt::gmtime(t)));
-}