diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-12-15 12:01:36 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-12-15 12:01:36 +0100 |
| commit | ff6ce1d7c00be2279f905b2f08cbbd67fa239ae7 (patch) | |
| tree | 65d64765acb2a6e18880ef2953a73a2c36e4086c /examples/cppunittest/HelperMacrosTest.cpp | |
| parent | 9e22a4f7c7794ab1cbd808058c13356f38ed632a (diff) | |
| download | cppunit-ff6ce1d7c00be2279f905b2f08cbbd67fa239ae7.tar.gz | |
we no longer need a wrapper for the smart pointer case
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 0e2a8b8..4e83b81 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 <cppunit/portability/SmartPtr.h> +#include <memory> /* Note: - no unit test for CPPUNIT_TEST_SUITE_REGISTRATION... @@ -132,7 +132,7 @@ HelperMacrosTest::tearDown() void HelperMacrosTest::testNoSubclassing() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( BaseTestCase::suite() ); + std::unique_ptr<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() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( SubclassedTestCase::suite() ); + std::unique_ptr<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() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( FailTestFixture::suite() ); + std::unique_ptr<CPPUNIT_NS::TestSuite> suite( FailTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectNoFailure(); @@ -170,7 +170,7 @@ HelperMacrosTest::testFail() void HelperMacrosTest::testFailToFail() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( FailToFailTestFixture::suite() ); + std::unique_ptr<CPPUNIT_NS::TestSuite> suite( FailToFailTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -182,7 +182,7 @@ HelperMacrosTest::testFailToFail() void HelperMacrosTest::testException() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( ExceptionTestFixture::suite() ); + std::unique_ptr<CPPUNIT_NS::TestSuite> suite( ExceptionTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectNoFailure(); @@ -194,7 +194,7 @@ HelperMacrosTest::testException() void HelperMacrosTest::testExceptionNotCaught() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( ExceptionNotCaughtTestFixture::suite() ); + std::unique_ptr<CPPUNIT_NS::TestSuite> suite( ExceptionNotCaughtTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 1 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -206,7 +206,7 @@ HelperMacrosTest::testExceptionNotCaught() void HelperMacrosTest::testCustomTests() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( CustomsTestTestFixture::suite() ); + std::unique_ptr<CPPUNIT_NS::TestSuite> suite( CustomsTestTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 2 ); m_testListener->setExpectedAddFailureCall( 1 ); @@ -218,7 +218,7 @@ HelperMacrosTest::testCustomTests() void HelperMacrosTest::testAddTest() { - CppUnitSmartPtr<CPPUNIT_NS::TestSuite> suite( AddTestTestFixture::suite() ); + std::unique_ptr<CPPUNIT_NS::TestSuite> suite( AddTestTestFixture::suite() ); m_testListener->setExpectedStartTestCall( 7 ); m_testListener->setExpectedAddFailureCall( 0 ); |