Changeset 914 for trunk/src/lol/unit.hTweet

Timestamp:

Sep 8, 2011, 12:21:29 AM (11 years ago)

Author:

sam

Message:

test: get rid of the need for LOLUNIT_SETUP_FIXTURE().

File:

• trunk/src/lol/unit.h (modified) (7 diffs)

trunk/src/lol/unit.h

@@ -170 +170 @@
 #define LOLUNIT_FIXTURE(FixtureName) \
     class FixtureName; \
+    template<typename T> struct Make##FixtureName \
+    { \
+        Make##FixtureName() { new T(); } \
+    }; \
+    Make##FixtureName<FixtureName> lol_unit_fixture_##FixtureName; \
     static char const *LolUnitFixtureName(FixtureName *p) \
     { \
@@ -190 +195 @@
     void TestCaseName()
 
-#define LOLUNIT_SETUP_FIXTURE(ClassName) \
-    ClassName ClassName##Test_Instance;
-
-#define LOLUNIT_ASSERT(cond) \
+#define LOLUNIT_ASSERT_GENERIC(message, cond) \
     do { \
         m_asserts++; \
@@ -205 +207 @@
             m_errorlog << "assertion failed" << std::endl; \
             m_errorlog << "- Expression: " << #cond << std::endl; \
+            m_errorlog << message; \
             m_failure = true; \
             return; \
@@ -210 +213 @@
     } while(!True())
 
-#define LOLUNIT_ASSERT_EQUAL(a, b) \
+#define LOLUNIT_ASSERT_EQUAL_GENERIC(message, a, b) \
     do { \
         m_asserts++; \
@@ -229 +232 @@
     } while(!True())
 
-#define LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, t) \
+#define LOLUNIT_ASSERT_DOUBLES_EQUAL_GENERIC(message, a, b, t) \
     do { \
         m_asserts++; \
@@ -243 +246 @@
             m_errorlog << "- Actual  : " << (a) << std::endl; \
             m_errorlog << "- Delta   : " << (t) << std::endl; \
+            m_errorlog << message; \
             m_failure = true; \
             return; \
@@ -248 +252 @@
     } while(!True())
 
+#define LOLUNIT_FAIL(message) \
+    do { \
+        m_asserts++; \
+        m_errorlog << std::endl << std::endl; \
+        m_errorlog << ++m_failcases << ") test: " \
+                   << LolUnitFixtureName(this) << "::" << m_currentname \
+                   << " (F) line: " << __LINE__ << " " \
+                   << __FILE__ << std::endl; \
+        m_errorlog << "forced failure" << std::endl; \
+        m_errorlog << "- " << message << std::endl; \
+        m_failure = true; \
+        return; \
+    } while(!True())
+
+#define LOLUNIT_ASSERT(cond) \
+    LOLUNIT_ASSERT_GENERIC("", cond)
+
+#define LOLUNIT_ASSERT_MESSAGE(message, cond) \
+    LOLUNIT_ASSERT_GENERIC("- " << message << std::endl, cond)
+
+#define LOLUNIT_ASSERT_EQUAL(a, b) \
+    LOLUNIT_ASSERT_EQUAL_GENERIC("", a, b)
+
+#define LOLUNIT_ASSERT_EQUAL_MESSAGE(message, a, b) \
+    LOLUNIT_ASSERT_EQUAL_GENERIC("- " << message << std::endl, a, b)
+
+#define LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, t) \
+    LOLUNIT_ASSERT_DOUBLES_EQUAL_GENERIC("", a, b, t)
+
+#define LOLUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(message, a, b, t) \
+    LOLUNIT_ASSERT_DOUBLES_EQUAL_GENERIC("- " << message << std::endl, a, b, t)
+
 } /* namespace lol */