[limb-svn] r6868 - in 3.x/trunk/limb/toolkit: src tests/cases

[svn at limb-project.com]

Author: pachanga
Date: 2008-03-30 12:20:27 +0400 (Sun, 30 Mar 2008)
New Revision: 6868
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6868

Modified:
   3.x/trunk/limb/toolkit/src/lmbToolkit.class.php
   3.x/trunk/limb/toolkit/tests/cases/lmbToolkitTest.class.php
Log:
-- contraversal commit which makes lmbToolkit::save() not to return the clean copy but use the current one as a base

Modified: 3.x/trunk/limb/toolkit/src/lmbToolkit.class.php
===================================================================
--- 3.x/trunk/limb/toolkit/src/lmbToolkit.class.php	2008-03-29 06:54:12 UTC (rev 6867)
+++ 3.x/trunk/limb/toolkit/src/lmbToolkit.class.php	2008-03-30 08:20:27 UTC (rev 6868)
@@ -129,7 +129,10 @@
   {
     $toolkit = lmbToolkit :: instance();
 
-    $tools = lmbRegistry :: get('lmbToolkitToolsCopy');
+    //$tools = lmbRegistry :: get('lmbToolkitToolsCopy');
+    //$tools_copy = clone($tools);
+
+    $tools = $toolkit->_tools;
     $tools_copy = clone($tools);
 
     $toolkit->setTools($tools_copy);
@@ -142,7 +145,6 @@
 
     lmbRegistry :: set('lmbToolkitProperties', $toolkit->export());
     lmbRegistry :: save('lmbToolkitProperties');
-    $toolkit->reset(array());
 
     return $toolkit;
   }
@@ -162,6 +164,7 @@
     $tools = lmbRegistry :: get('lmbToolkitTools');
     $toolkit->setTools($tools);
 
+    $toolkit->reset();
     $toolkit->import(lmbRegistry :: get('lmbToolkitProperties'));
 
     return $toolkit;

Modified: 3.x/trunk/limb/toolkit/tests/cases/lmbToolkitTest.class.php
===================================================================
--- 3.x/trunk/limb/toolkit/tests/cases/lmbToolkitTest.class.php	2008-03-29 06:54:12 UTC (rev 6867)
+++ 3.x/trunk/limb/toolkit/tests/cases/lmbToolkitTest.class.php	2008-03-30 08:20:27 UTC (rev 6868)
@@ -119,16 +119,16 @@
 
     $toolkit = lmbToolkit :: save();
     $toolkit->foo();
-    $this->assertEqual($toolkit->getFooCounter(), 1);
-    $toolkit = lmbToolkit :: restore();
-
-    $toolkit->foo();
     $this->assertEqual($toolkit->getFooCounter(), 3);
 
     $toolkit = lmbToolkit :: save();
     $toolkit->foo();
-    $this->assertEqual($toolkit->getFooCounter(), 1);
+    $this->assertEqual($toolkit->getFooCounter(), 4);
+
     $toolkit = lmbToolkit :: restore();
+    $this->assertEqual($toolkit->getFooCounter(), 3);
+    $toolkit = lmbToolkit :: restore();
+    $this->assertEqual($toolkit->getFooCounter(), 2);
   }
 
   function testSaveAndRestoreAlwaysReturnTheSameToolkitInstance()