merge recent changes into HEAD

1 files changed, 16 insertions, 47 deletions

diff --git a/test/TestBitPreferencesCache.php b/test/TestBitPreferencesCache.php
index 0895c82..3db4318 100644
--- a/test/TestBitPreferencesCache.php
+++ b/test/TestBitPreferencesCache.php
@@ -6,6 +6,8 @@ require_once(KERNEL_PKG_PATH.'test/TestBitPreferences.php');
 class TestBitPreferencesCache extends TestBitPreferences {
 
 
+    var $name = "TestBitPreferencesCache";
+
     function setUp ()
     {
 	global $gBitDb, $gCache;
@@ -17,10 +19,6 @@ class TestBitPreferencesCache extends TestBitPreferences {
 	$this->test->mDebug = false;
 	$gBitDb = $tmpDB;
 	$gCache = $tmpCache;
-	// $this->assertNotNull($this->test),
-	//                    'Error during initialisation');
-	// This check is probably not needed - it only adds to the passes
-	// and if it is not true it does not save anything anyway.
     }
 
     function tearDown ()
@@ -29,73 +27,44 @@ class TestBitPreferencesCache extends TestBitPreferences {
     }
 
 
-  /*
-
-  We are using inheritance instead
-    var $name = "TestBitPreferencesCache";
-
-    function initBitPreferences()
-    {
-	global $gBitDb;
-	$tmpDB = $gBitDb;
-	$gBitDb = NULL;
-        $test = new BitPreferences($this->name);
-	$gBitDb = $tmpDB;
-	return $test;
-    }
+# [tests]
 
     function TestBitPreferencesCache()
     {
-	#global $gCache;
-	#if (!is_object($gCache)) {
-	#  print "We have LANDED <br />\n";
-	#	$this = NULL;
-	#	return;
-	#}
-        $test = $this->initBitPreferences();
-	// This check is probably not needed - it only adds to the passes
-	// and if it is not true it does not save anything anyway.
-
-        // Assert::equals($test != NULL, 'Error during initialisation');
+      // no general initalization
 	
     }
     
     function testGetNonexistentItem()
     {
-        $test = $this->initBitPreferences();
-        $this->assertNull($test->getPreference("test"));
+        $this->assertNull($this->test->getPreference("test"));
     }
     
     function testSetNonexistentItem()
     {
-        $test = $this->initBitPreferences();
-        $test->setPreference("test", "123");
-        $this->assertEqual($test->getPreference("test"), "123");
+        $this->test->setPreference("test", "123");
+        $this->assertEqual($this->test->getPreference("test"), "123");
     }
     
     function testSetDefaultItem()
     {
-        $test = $this->initBitPreferences();
-        $test->setDefaultPreference("test", "456");
-        $this->assertEqual($test->getPreference("test"), "123");
+	$this->test->setPreference("test", "123");
+        $this->test->setDefaultPreference("test", "456");
+        $this->assertEqual($this->test->getPreference("test"), "123");
     }
     
     function testSetAsDefaultItem()
     {
-        $test = $this->initBitPreferences();
-        $test->setDefaultPreference("test", "456");
-        $test->setPreference("test", "456");
-        $this->assertEqual($test->getPreference("test"), "456");
+        $this->test->setDefaultPreference("test", "456");
+        $this->test->setPreference("test", "456");
+        $this->assertEqual($this->test->getPreference("test"), "456");
     }
 
     function testResetItem()
     {
-        $test = $this->initBitPreferences();
-        $test->setDefaultPreference("test", "456");
-        $test->setPreference("test", NULL);
-        $this->assertEqual($test->getPreference("test"), "456");
+        $this->test->setDefaultPreference("test", "456");
+        $this->test->setPreference("test", NULL);
+        $this->assertEqual($this->test->getPreference("test"), "456");
     }
-  */
-
 }
 ?>