commit 0847a0fa899fb5bdf8a3b094f7b685bb3428410c
author Phil Nash <phil@twobluecubes.com> Tue Feb 01 16:09:18 2011 +0000
committer Phil Nash <phil@twobluecubes.com> Tue Feb 01 16:09:18 2011 +0000
tree 17445793e6803d46fa8c4bf60fea4297e1c9475a
parent d1ee964f5d203a1b5783e0fd8f54fd5f8db27491

Fixed OC bindings project following recent changes

catch_objc.hpp

diff --git a/catch_objc.hpp b/catch_objc.hpp
index 9a92c31..7f459a7 100644
--- a/catch_objc.hpp
+++ b/catch_objc.hpp
@@ -16,6 +16,7 @@
 #import <objc/runtime.h>
 #include <string>
 #include "catch.hpp"
+#include "internal/catch_test_case_info.hpp"
 
 @protocol OcFixture
 
@@ -28,7 +29,7 @@
 
 namespace Catch 
 {
-    class OcMethod : public TestCase
+    class OcMethod : public ITestCase
     {
     public:
         OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel )
@@ -52,18 +53,18 @@
             [obj release];
         }
         
-        virtual TestCase* clone() const
+        virtual ITestCase* clone() const
         {
             return new OcMethod( m_cls, m_sel );
         }
         
-        virtual bool operator == ( const TestCase& other ) const
+        virtual bool operator == ( const ITestCase& other ) const
         {
             const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other );
             return ocmOther && ocmOther->m_sel == m_sel;
         }
         
-        virtual bool operator < ( const TestCase& other ) const
+        virtual bool operator < ( const ITestCase& other ) const
         {
             const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other );
             return ocmOther && ocmOther->m_sel < m_sel;
@@ -114,10 +115,10 @@
                     if( Detail::startsWith( methodName, "Catch_TestCase_" ) )
                     {
                         std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        const char* desc = Detail::getAnnotation( cls, "Description", testCaseName );
                         
-                        TestRegistry::instance().registerTest( TestCaseInfo( new OcMethod( cls, selector ), name, desc ) );
+                        Hub::getTestCaseRegistry().registerTest( TestCaseInfo( new OcMethod( cls, selector ), name, desc ) );
                         noTestMethods++;
                         
                     }