Cleanup tests

test/test-assert.h

@@ -10,6 +10,11 @@
 
 #include <stdexcept>
 
+void throw_assertion_failure(const char* message);
+#define FMT_ASSERT(condition, message) \
+  if (!(condition)) throw_assertion_failure(message);
+
+#include "gtest-extra.h"
 #include "gtest/gtest.h"
 
 class assertion_failure : public std::logic_error {
@@ -28,9 +33,6 @@ inline void throw_assertion_failure(const char* message) {
   throw assertion_failure(message);
 }
 
-#define FMT_ASSERT(condition, message) \
-  if (!(condition)) throw_assertion_failure(message);
-
 // Expects an assertion failure.
 #define EXPECT_ASSERT(stmt, message) \
   FMT_TEST_THROW_(stmt, assertion_failure, message, GTEST_NONFATAL_FAILURE_)