[commit] r2222 - in trunk: GME/Mga Tests/GPyUnit

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed May 29 15:21:27 2013
New Revision: 2222

Log:
When creating an instance, dont copy the archetype's registry; it should be inherited

Modified:
   trunk/GME/Mga/MgaComplexOps.cpp
   trunk/Tests/GPyUnit/test_registry.py

Modified: trunk/GME/Mga/MgaComplexOps.cpp
==============================================================================
--- trunk/GME/Mga/MgaComplexOps.cpp	Wed May 29 15:21:06 2013	(r2221)
+++ trunk/GME/Mga/MgaComplexOps.cpp	Wed May 29 15:21:27 2013	(r2222)
@@ -458,6 +458,7 @@
 				case ATTRID_LASTRELID: 
 					newobj[ai] = 0L;
 					break;
+				case ATTRID_REGNODE:
 				case ATTRID_GUID1: // don't copy these
 				case ATTRID_GUID2:
 				case ATTRID_GUID3:

Modified: trunk/Tests/GPyUnit/test_registry.py
==============================================================================
--- trunk/Tests/GPyUnit/test_registry.py	Wed May 29 15:21:06 2013	(r2221)
+++ trunk/Tests/GPyUnit/test_registry.py	Wed May 29 15:21:27 2013	(r2222)
@@ -130,6 +130,7 @@
                 if self.project.RootMeta.RootFolder.DefinedFCOs.Item(i).Name == 'ParadigmSheet':
                     sheet_meta = self.project.RootMeta.RootFolder.DefinedFCOs.Item(i)
             sheet = self.project.RootFolder.CreateRootObject(sheet_meta)
+            sheet.SetRegistryValueDisp('testcreation', 'testcreate')
             sheet2 = self.project.RootFolder.DeriveRootObject(sheet, False)
             sheet3 = self.project.RootFolder.DeriveRootObject(sheet2, False)
             sheet4 = self.project.RootFolder.DeriveRootObject(sheet3, False)
@@ -138,9 +139,10 @@
             self.assertEqual(sheet4.GetRegistryValueDisp('test123'), 'test')
             sheet3.DetachFromArcheType()
             self.assertEqual(sheet4.GetRegistryValueDisp('test123'), 'test')
-            self.assertEqual(sheet.GetRegistryDisp(False).Count, 1)
+            self.assertEqual(sheet.GetRegistryDisp(False).Count, 2)
+            self.assertEqual(sheet4.GetRegistryDisp(False).Count, 0)
+            self.assertEqual(sheet3.GetRegistryDisp(False).Count, 3) # detaching adds a regnode "_detachedFrom"
             self.assertEqual(sheet4.GetRegistryDisp(False).Count, 0)
-            self.assertEqual(sheet3.GetRegistryDisp(False).Count, 2) # detaching adds a regnode
             self.assertEqual(sheet4.GetRegistryDisp(False).Count, 0)
             self.project.CommitTransaction()
             self.project.Save()