From 0fe5931684897b9bf7a445986ec6e438090ea06c Mon Sep 17 00:00:00 2001 From: "christian.brunschen" Date: Sat, 2 Aug 2008 08:36:54 +0000 Subject: [PATCH] fixed CountedTest compilation problem attempting to access a private variable. Also fixed TestRunner exit status. git-svn-id: https://zxing.googlecode.com/svn/trunk@543 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- cpp/core/tests/src/TestRunner.cpp | 2 +- cpp/core/tests/src/common/CountedTest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/core/tests/src/TestRunner.cpp b/cpp/core/tests/src/TestRunner.cpp index ba3ba46c3..4aba6e7e4 100644 --- a/cpp/core/tests/src/TestRunner.cpp +++ b/cpp/core/tests/src/TestRunner.cpp @@ -27,5 +27,5 @@ int main(int argc, char **argv) CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry(); runner.addTest(registry.makeTest()); bool wasSuccessful = runner.run("", false); - return wasSuccessful; + return wasSuccessful ? 0 : 1; } \ No newline at end of file diff --git a/cpp/core/tests/src/common/CountedTest.cpp b/cpp/core/tests/src/common/CountedTest.cpp index f496c8dbe..741f2e92b 100644 --- a/cpp/core/tests/src/common/CountedTest.cpp +++ b/cpp/core/tests/src/common/CountedTest.cpp @@ -39,14 +39,14 @@ namespace common { void CountedTest::test() { Foo foo; - CPPUNIT_ASSERT_EQUAL(0U, foo.count_); + CPPUNIT_ASSERT_EQUAL(0, foo.count()); foo.retain(); - CPPUNIT_ASSERT_EQUAL(1U, foo.count_); + CPPUNIT_ASSERT_EQUAL(1, foo.count()); { Ref fooRef(foo); - CPPUNIT_ASSERT_EQUAL(2U, foo.count_); + CPPUNIT_ASSERT_EQUAL(2, foo.count()); } - CPPUNIT_ASSERT_EQUAL(1U, foo.count_); + CPPUNIT_ASSERT_EQUAL(1, foo.count()); } }