add tests for index cache

diff --git a/framework/Db/test/Horde/Db/Adapter/MysqliTest.php b/framework/Db/test/Horde/Db/Adapter/MysqliTest.php
index 0a31f0b..006e8e0 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/MysqliTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/MysqliTest.php
@@ -809,10 +809,22 @@ class Horde_Db_Adapter_MysqliTest extends PHPUnit_Framework_TestCase
 
 
     /*##########################################################################
-    # Test Cached table descriptions
+    # Test table cache
     ##########################################################################*/
 
-    public function testCachedTableDescription()
+    public function testCachedTableIndexes()
+    {
+        // remove any current cache.
+        $this->_cache->set('tables/indexes/cache_table', '');
+        $this->assertEquals('', $this->_cache->get('tables/indexes/cache_table'));
+
+        $this->_createTestTable('cache_table');
+        $idxs = $this->_conn->indexes('cache_table');
+
+        $this->assertNotEquals('', $this->_cache->get('tables/indexes/cache_table'));
+    }
+
+    public function testCachedTableColumns()
     {
         // remove any current cache.
         $this->_cache->set('tables/columns/cache_table', '');

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php
index 7f3652b..212b55a 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php
@@ -809,10 +809,22 @@ class Horde_Db_Adapter_Pdo_MysqlTest extends PHPUnit_Framework_TestCase
 
 
     /*##########################################################################
-    # Test Cached table descriptions
+    # Test table cache
     ##########################################################################*/
 
-    public function testCachedTableDescription()
+    public function testCachedTableIndexes()
+    {
+        // remove any current cache.
+        $this->_cache->set('tables/indexes/cache_table', '');
+        $this->assertEquals('', $this->_cache->get('tables/indexes/cache_table'));
+
+        $this->_createTestTable('cache_table');
+        $idxs = $this->_conn->indexes('cache_table');
+
+        $this->assertNotEquals('', $this->_cache->get('tables/indexes/cache_table'));
+    }
+
+    public function testCachedTableColumns()
     {
         // remove any current cache.
         $this->_cache->set('tables/columns/cache_table', '');

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php
index f0331e0..6744842 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php
@@ -781,10 +781,22 @@ class Horde_Db_Adapter_Pdo_PgsqlTest extends PHPUnit_Framework_TestCase
 
 
     /*##########################################################################
-    # Test Cached table descriptions
+    # Test table cache
     ##########################################################################*/
 
-    public function testCachedTableDescription()
+    public function testCachedTableIndexes()
+    {
+        // remove any current cache.
+        $this->_cache->set('tables/indexes/cache_table', '');
+        $this->assertEquals('', $this->_cache->get('tables/indexes/cache_table'));
+
+        $this->_createTestTable('cache_table');
+        $idxs = $this->_conn->indexes('cache_table');
+
+        $this->assertNotEquals('', $this->_cache->get('tables/indexes/cache_table'));
+    }
+
+    public function testCachedTableColumns()
     {
         // remove any current cache.
         $this->_cache->set('tables/columns/cache_table', '');

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php
index a89bcc2..04d763c 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php
@@ -825,11 +825,24 @@ class Horde_Db_Adapter_Pdo_SqliteTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('SELECT * FROM documents ORDER BY name DESC', $result);
     }
 
+
     /*##########################################################################
-    # Test Cached table descriptions
+    # Test table cache
     ##########################################################################*/
 
-    public function testCachedTableDescription()
+    public function testCachedTableIndexes()
+    {
+        // remove any current cache.
+        $this->_cache->set('tables/indexes/cache_table', '');
+        $this->assertEquals('', $this->_cache->get('tables/indexes/cache_table'));
+
+        $this->_createTestTable('cache_table');
+        $idxs = $this->_conn->indexes('cache_table');
+
+        $this->assertNotEquals('', $this->_cache->get('tables/indexes/cache_table'));
+    }
+
+    public function testCachedTableColumns()
     {
         // remove any current cache.
         $this->_cache->set('tables/columns/cache_table', '');