shorten table identifiers in tests

diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml
index af2e5ce3439131671ca96378d8cfb1e9e97d02a1..8f6dc5e2ecd539b9571ec8a66da28563c97208e7 100644 (file)
--- a/tests/data/db_structure.xml
+++ b/tests/data/db_structure.xml
@@ -9,7 +9,7 @@
 
  <table>
 
-  <name>*dbprefix*contacts_addressbooks</name>
+  <name>*dbprefix*cntcts_addrsbks</name>
 
   <declaration>
 
@@ -77,7 +77,7 @@
 
  <table>
 
-  <name>*dbprefix*contacts_cards</name>
+  <name>*dbprefix*cntcts_cards</name>
 
   <declaration>
 

diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml
index c1bbb550483076a1b0b89ffc7f5d753e48a92ef7..fc6fe0bba7d513d14e997fc97631f3bc85d6a79b 100644 (file)
--- a/tests/data/db_structure2.xml
+++ b/tests/data/db_structure2.xml
@@ -9,7 +9,7 @@
 
  <table>
 
-  <name>*dbprefix*contacts_addressbooks</name>
+  <name>*dbprefix*cntcts_addrsbks</name>
 
   <declaration>
 

diff --git a/tests/lib/db.php b/tests/lib/db.php
index 440f3fb6bfd5be3ca5a98726834eb6e6509eb0f6..d6626bc25610bdb1411694194eb74187b96d6f33 100644 (file)
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -22,8 +22,8 @@ class Test_DB extends PHPUnit_Framework_TestCase {
                OC_DB::createDbFromStructure(self::$schema_file);
 
                $this->test_prefix = $r;
-               $this->table1 = $this->test_prefix.'contacts_addressbooks';
-               $this->table2 = $this->test_prefix.'contacts_cards';
+               $this->table1 = $this->test_prefix.'cntcts_addrsbks';
+               $this->table2 = $this->test_prefix.'cntcts_cards';
                $this->table3 = $this->test_prefix.'vcategory';
        }
 

diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index e20a04ef7fd06fe9d64e55b8de3e7feab9c7e413..dbc1283964f79b9f7913e5cb18b20d1fd7b57d5a 100644 (file)
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -26,8 +26,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
                file_put_contents( self::$schema_file2, $content );
 
                $this->test_prefix = $r;
-               $this->table1 = $this->test_prefix.'contacts_addressbooks';
-               $this->table2 = $this->test_prefix.'contacts_cards';
+               $this->table1 = $this->test_prefix.'cntcts_addrsbks';
+               $this->table2 = $this->test_prefix.'cntcts_cards';
        }
 
        public function tearDown() {