Changeset 9629 for code/branches/core6/test/core

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:

code/branches/core6/test/core

Files:

• class/SubclassIdentifierTest.cc (modified) (2 diffs)
• class/SuperTest.cc (modified) (2 diffs)
• object/ContextTest.cc (modified) (3 diffs, 1 prop)

code/branches/core6/test/core/class/SubclassIdentifierTest.cc

@@ -12 +12 @@
         {
             public:
-                TestClass(BaseObject* creator = NULL) { RegisterRootObject(TestClass); }
+                TestClass(Context* context = NULL) { RegisterRootObject(TestClass); }
         };
 
@@ -18 +18 @@
         {
             public:
-                TestSubclass(BaseObject* creator = NULL) { RegisterObject(TestSubclass); }
+                TestSubclass(Context* context = NULL) { RegisterObject(TestSubclass); }
         };
 

code/branches/core6/test/core/class/SuperTest.cc

@@ -13 +13 @@
         {
             public:
-                TestClass(BaseObject* creator = NULL) : BaseObject(NULL), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)
+                TestClass(Context* context = NULL) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)
                 {
                     RegisterRootObject(TestClass);
@@ -37 +37 @@
         {
             public:
-                TestSubclass(BaseObject* creator = NULL) : changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP)
+                TestSubclass(Context* context = NULL) : TestClass(context), changedNameSubclass_(false), xmlPortSubclass_(false), modeSubclass_(XMLPort::NOP)
                 {
                     RegisterObject(TestSubclass);

code/branches/core6/test/core/object/ContextTest.cc

@@ -11 +11 @@
         {
             public:
-                SubclassContext() { RegisterRootObject(SubclassContext); }
+                SubclassContext() : Context(NULL) { RegisterRootObject(SubclassContext); }
         };
     }
@@ -17 +17 @@
     TEST(ContextTest, CanCreateContext)
     {
-        Context context;
+        Context context(NULL);
     }
 
@@ -27 +27 @@
     TEST(ContextTest, ContextIsItsOwnContext)
     {
-        Context context;
+        Context context(NULL);
         EXPECT_EQ(&context, context.getContext());
     }