diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-11-07 05:41:20 -0800 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-11-07 06:06:09 -0800 |
| commit | 5cb290d77a3539a492eac43202f27ecd150c99a0 (patch) | |
| tree | 794065d4987c1b226209dd30b24830b80a47e6b2 /examples/cppunittest/HelperMacrosTest.cpp | |
| parent | c5813be8793da22ec25e4dfdf9d6dec43695cbeb (diff) | |
| download | cppunit-5cb290d77a3539a492eac43202f27ecd150c99a0.tar.gz | |
add a flag for adding optional features
These features will switch the used C++ version from C++03 to C++11. We
are also going to use std::unique_ptr instead of std::auto_ptr for the
c++11 mode.
Diffstat (limited to 'examples/cppunittest/HelperMacrosTest.cpp')
| -rw-r--r-- | examples/cppunittest/HelperMacrosTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/cppunittest/HelperMacrosTest.cpp b/examples/cppunittest/HelperMacrosTest.cpp index b88dec6..0e2a8b8 100644 --- a/examples/cppunittest/HelperMacrosTest.cpp +++ b/examples/cppunittest/HelperMacrosTest.cpp @@ -5,7 +5,7 @@ #include "MockTestCase.h" #include "SubclassedTestCase.h" #include <cppunit/TestResult.h> -#include <memory> +#include <cppunit/portability/SmartPtr.h> /* Note: - no unit test for CPPUNIT_TEST_SUITE_REGISTRATION... @@ -132,7 +132,7 @@ HelperMacrosTest::tearDown() void HelperMacrosTest::testNoSubclassing() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( BaseTestCase::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( BaseTestCase::suite() ); CPPUNIT_ASSERT_EQUAL( 1, suite->countTestCases() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectNoFailure(); @@ -145,7 +145,7 @@ HelperMacrosTest::testNoSubclassing() void HelperMacrosTest::testSubclassing() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( SubclassedTestCase::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( SubclassedTestCase::suite() ); CPPUNIT_ASSERT_EQUAL( 2, suite->countTestCases() ); m_testListener->setExpectedStartTestCall( 2 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -158,7 +158,7 @@ HelperMacrosTest::testSubclassing() void HelperMacrosTest::testFail() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( FailTestFixture::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( FailTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectNoFailure(); @@ -170,7 +170,7 @@ HelperMacrosTest::testFail() void HelperMacrosTest::testFailToFail() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( FailToFailTestFixture::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( FailToFailTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -182,7 +182,7 @@ HelperMacrosTest::testFailToFail() void HelperMacrosTest::testException() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( ExceptionTestFixture::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( ExceptionTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectNoFailure(); @@ -194,7 +194,7 @@ HelperMacrosTest::testException() void HelperMacrosTest::testExceptionNotCaught() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( ExceptionNotCaughtTestFixture::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( ExceptionNotCaughtTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -206,7 +206,7 @@ HelperMacrosTest::testExceptionNotCaught() void HelperMacrosTest::testCustomTests() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( CustomsTestTestFixture::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( CustomsTestTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 2 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -218,7 +218,7 @@ HelperMacrosTest::testCustomTests() void HelperMacrosTest::testAddTest() { - std::auto_ptr<CPPUNIT_NS::TestSuite> suite( AddTestTestFixture::suite() ); + CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( AddTestTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 7 ); m_testListener->setExpectedAddFailureCall( 0 ); |