Merge pull request #26 from pjohnmeyer/fixUnitTestTimeConstraintExemptForFixtures

pjohnmeyer · pjohnmeyer · commit 8faa479e4beb · 2013-02-05T19:15:13.000-08:00
Fix unit test time constraint exempt for fixtures; closes #9.
diff --git a/src/Test.cpp b/src/Test.cpp
@@ -21,7 +21,6 @@ TestList& Test::GetTestList()
 Test::Test(char const* testName, char const* suiteName, char const* filename, int lineNumber)
     : m_details(testName, suiteName, filename, lineNumber)
     , m_nextTest(0)
-    , m_timeConstraintExempt(false)
 	, m_isMockTest(false)
 {
 }
diff --git a/src/Test.h b/src/Test.h
@@ -17,7 +17,7 @@ class UNITTEST_LINKAGE Test
 
     TestDetails const m_details;
     Test* m_nextTest;
-    mutable bool m_timeConstraintExempt;
+
 	mutable bool m_isMockTest;
 
     static TestList& GetTestList();
diff --git a/src/TestDetails.cpp b/src/TestDetails.cpp
@@ -7,6 +7,7 @@ TestDetails::TestDetails(char const* testName_, char const* suiteName_, char con
     , testName(testName_)
     , filename(filename_)
     , lineNumber(lineNumber_)
+    , timeConstraintExempt(false)
 {
 }
 
@@ -15,6 +16,7 @@ TestDetails::TestDetails(const TestDetails& details, int lineNumber_)
     , testName(details.testName)
     , filename(details.filename)
     , lineNumber(lineNumber_)
+    , timeConstraintExempt(details.timeConstraintExempt)
 {
 }
 
diff --git a/src/TestDetails.h b/src/TestDetails.h
@@ -15,6 +15,7 @@ class UNITTEST_LINKAGE TestDetails
     char const* const testName;
     char const* const filename;
     int const lineNumber;
+    mutable bool timeConstraintExempt;
 
     TestDetails(TestDetails const&); // Why is it public? --> http://gcc.gnu.org/bugs.html#cxx_rvalbind
 private:
diff --git a/src/TestRunner.cpp b/src/TestRunner.cpp
@@ -67,7 +67,7 @@ void TestRunner::RunTest(TestResults* const result, Test* const curTest, int con
 	curTest->Run();
 
 	double const testTimeInMs = testTimer.GetTimeInMs();
-	if (maxTestTimeInMs > 0 && testTimeInMs > maxTestTimeInMs && !curTest->m_timeConstraintExempt)
+	if (maxTestTimeInMs > 0 && testTimeInMs > maxTestTimeInMs && !curTest->m_details.timeConstraintExempt)
 	{
 	    MemoryOutStream stream;
 	    stream << "Global time constraint failed. Expected under " << maxTestTimeInMs <<
diff --git a/src/TimeConstraint.h b/src/TimeConstraint.h
@@ -29,7 +29,7 @@ class UNITTEST_LINKAGE TimeConstraint
 
 #define UNITTEST_TIME_CONSTRAINT_EXEMPT() \
 	UNITTEST_MULTILINE_MACRO_BEGIN \
-	m_timeConstraintExempt = true; \
+	m_details.timeConstraintExempt = true; \
 	UNITTEST_MULTILINE_MACRO_END
 
 }
diff --git a/src/tests/TestTestRunner.cpp b/src/tests/TestTestRunner.cpp
@@ -207,24 +207,30 @@ TEST_FIXTURE(TestRunnerFixture, SlowTestHasCorrectFailureInformation)
     CHECK(strstr(reporter.lastFailedMessage, "3ms"));
 }
 
-TEST_FIXTURE(TestRunnerFixture, SlowTestWithTimeExemptionPasses)
+
+namespace SlowTestHelper
 {
-    class SlowExemptedTest : public Test
-    {
-    public:
-        SlowExemptedTest() : Test("slowexempted", "", 0) {}
-        virtual void RunImpl() const
-        {
-            UNITTEST_TIME_CONSTRAINT_EXEMPT();
-            TimeHelpers::SleepMs(20);
-        }
-    };
+    TestRunnerFixture testRunnerFixture;
 
-    SlowExemptedTest test;
-    list.Add(&test);
+    TEST_EX(SlowExemptedTest, testRunnerFixture.list)
+    {
+        UNITTEST_TIME_CONSTRAINT_EXEMPT();
+        TimeHelpers::SleepMs(20);
+    }
+    
+    class Fixture {};
+    
+    TEST_FIXTURE_EX(Fixture, SlowExemptedTest, testRunnerFixture.list)
+    {
+        UNITTEST_TIME_CONSTRAINT_EXEMPT();
+        TimeHelpers::SleepMs(20);
+    }
+}
 
-	runner.RunTestsIf(list, NULL, True(), 3);
-    CHECK_EQUAL(0, reporter.testFailedCount);
+TEST(SlowTestsWithTimeExemptionPass)
+{
+    SlowTestHelper::testRunnerFixture.runner.RunTestsIf(SlowTestHelper::testRunnerFixture.list, NULL, True(), 3);
+    CHECK_EQUAL(0, SlowTestHelper::testRunnerFixture.reporter.testFailedCount);
 }
 
 struct TestSuiteFixture
diff --git a/src/tests/TestTimeConstraintMacro.cpp b/src/tests/TestTimeConstraintMacro.cpp
@@ -62,4 +62,27 @@ TEST(TimeConstraintMacroComparesAgainstPreciseActual)
     CHECK(strstr(reporter.lastFailedTest, "TimeConstraintMacroComparesAgainstPreciseActual"));
 }
 
+struct EmptyFixture {};
+
+TEST_FIXTURE(EmptyFixture, TimeConstraintMacroWorksInFixtures)
+{
+    int testLine = 0;
+    RecordingReporter reporter;
+
+    {
+      UnitTest::TestResults testResults(&reporter);
+      ScopedCurrentTest scopedResults(testResults);
+
+      UNITTEST_TIME_CONSTRAINT(10);  testLine = __LINE__;
+      UnitTest::TimeHelpers::SleepMs(20);
+    }
+
+    using namespace std;
+
+    CHECK_EQUAL(1, reporter.testFailedCount);
+    CHECK(strstr(reporter.lastFailedFile, __FILE__));
+    CHECK_EQUAL(testLine, reporter.lastFailedLine);
+    CHECK(strstr(reporter.lastFailedTest, "TimeConstraintMacroWorksInFixtures"));
+} 
+
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ TestList& Test::GetTestList()`
`21`	`21`	`Test::Test(char const* testName, char const* suiteName, char const* filename, int lineNumber)`
`22`	`22`	`: m_details(testName, suiteName, filename, lineNumber)`
`23`	`23`	`, m_nextTest(0)`
`24`		`- , m_timeConstraintExempt(false)`
`25`	`24`	`, m_isMockTest(false)`
`26`	`25`	`{`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ TestDetails::TestDetails(char const* testName_, char const* suiteName_, char con`
`7`	`7`	`, testName(testName_)`
`8`	`8`	`, filename(filename_)`
`9`	`9`	`, lineNumber(lineNumber_)`
	`10`	`+ , timeConstraintExempt(false)`
`10`	`11`	`{`
`11`	`12`	`}`
`12`	`13`
`@@ -15,6 +16,7 @@ TestDetails::TestDetails(const TestDetails& details, int lineNumber_)`
`15`	`16`	`, testName(details.testName)`
`16`	`17`	`, filename(details.filename)`
`17`	`18`	`, lineNumber(lineNumber_)`
	`19`	`+ , timeConstraintExempt(details.timeConstraintExempt)`
`18`	`20`	`{`
`19`	`21`	`}`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void TestRunner::RunTest(TestResults* const result, Test* const curTest, int con`
`67`	`67`	`curTest->Run();`
`68`	`68`
`69`	`69`	`double const testTimeInMs = testTimer.GetTimeInMs();`
`70`		`- if (maxTestTimeInMs > 0 && testTimeInMs > maxTestTimeInMs && !curTest->m_timeConstraintExempt)`
	`70`	`+ if (maxTestTimeInMs > 0 && testTimeInMs > maxTestTimeInMs && !curTest->m_details.timeConstraintExempt)`
`71`	`71`	`{`
`72`	`72`	`MemoryOutStream stream;`
`73`	`73`	`stream << "Global time constraint failed. Expected under " << maxTestTimeInMs <<`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class UNITTEST_LINKAGE TimeConstraint`
`29`	`29`
`30`	`30`	`#define UNITTEST_TIME_CONSTRAINT_EXEMPT() \`
`31`	`31`	`UNITTEST_MULTILINE_MACRO_BEGIN \`
`32`		`- m_timeConstraintExempt = true; \`
	`32`	`+ m_details.timeConstraintExempt = true; \`
`33`	`33`	`UNITTEST_MULTILINE_MACRO_END`
`34`	`34`
`35`	`35`	`}`