update the test suite to the current code

diff --git a/content/test/AllTests.php b/content/test/AllTests.php
index eff87e5..b8e5b09 100644 (file)
--- a/content/test/AllTests.php
+++ b/content/test/AllTests.php
@@ -11,10 +11,11 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 require_once 'PHPUnit/Framework/TestSuite.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
-// @TODO HACK
-define('AUTH_HANDLER', true);
-require dirname(__FILE__) . '/../lib/base.php';
-require $CONTENT_DIR . 'lib/Tags/Tagger.php';
+require 'Horde/Autoloader.php';
+require dirname(__FILE__) . '/../lib/Types/Manager.php';
+require dirname(__FILE__) . '/../lib/Users/Manager.php';
+require dirname(__FILE__) . '/../lib/Objects/Manager.php';
+require dirname(__FILE__) . '/../lib/Tagger.php';
 
 /**
  * @package    Rampage_Content

diff --git a/content/test/Tags/TaggerTest.php b/content/test/Tags/TaggerTest.php
index e42d831..8e2c5a3 100644 (file)
--- a/content/test/Tags/TaggerTest.php
+++ b/content/test/Tags/TaggerTest.php
@@ -23,8 +23,19 @@ class Content_Tags_TaggerTest extends PHPUnit_Framework_TestCase
             'dbname' => ':memory:',
         ));
 
+        $context = array('dbAdapter' => $this->db);
+
+        $this->typeManager = new Content_Types_Manager($context);
+        $context['typeManager'] = $this->typeManager;
+
+        $this->userManager = new Content_Users_Manager($context);
+        $context['userManager'] = $this->userManager;
+
+        $this->objectManager = new Content_Objects_Manager($context);
+        $context['objectManager'] = $this->objectManager;
+
         // Create tagger
-        $this->tagger = new Content_Tagger(array('dbAdapter' => $this->db));
+        $this->tagger = new Content_Tagger($context);
 
         // Read sql schema file
         $statements = array();
@@ -77,7 +88,7 @@ class Content_Tags_TaggerTest extends PHPUnit_Framework_TestCase
         $this->tagger->tag(1, 1, 1);
         $cloud = $this->tagger->getTagCloud();
         $this->assertEquals(1, $cloud[0]['tag_id']);
-        $this->assertEquals('work', $cloud[0]['tag_text']);
+        $this->assertEquals('work', $cloud[0]['tag_name']);
         $this->assertEquals(1, $cloud[0]['count']);
     }
         /*
@@ -117,7 +128,7 @@ var_dump($tagger->getRelatedObjects(3));
 
         $recentLimit = $this->tagger->getRecentTags(array('limit' => 25));
         $this->assertEquals(25, count($recentLimit));
-        $this->assertEquals('t1', $recentLimit[0]['tag_text']);
+        $this->assertEquals('t1', $recentLimit[0]['tag_name']);
     }
 
     public function testGetRecentTagsOffset()
@@ -131,7 +142,7 @@ var_dump($tagger->getRelatedObjects(3));
 
         $recentOffset = $this->tagger->getRecentTags(array('limit' => 25, 'offset' => 25));
         $this->assertEquals(25, count($recentOffset));
-        $this->assertEquals('t26', $recentOffset[0]['tag_text']);
+        $this->assertEquals('t26', $recentOffset[0]['tag_name']);
     }
 
     public function testGetRecentTagsByUser()

diff --git a/content/test/fixtures/schema.sql b/content/test/fixtures/schema.sql
index 5515434..33f6f69 100644 (file)
--- a/content/test/fixtures/schema.sql
+++ b/content/test/fixtures/schema.sql
@@ -13,15 +13,15 @@ CREATE UNIQUE INDEX rampage_types_type_name ON rampage_types (type_name);
 
 CREATE TABLE rampage_users (
   user_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-  user_username varchar(255) NOT NULL
+  user_name varchar(255) NOT NULL
 );
-CREATE UNIQUE INDEX rampage_users_user_username ON rampage_users (user_username);
+CREATE UNIQUE INDEX rampage_users_user_name ON rampage_users (user_name);
 
 CREATE TABLE rampage_tags (
   tag_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-  tag_text varchar(255) NOT NULL
+  tag_name varchar(255) NOT NULL
 );
-CREATE UNIQUE INDEX rampage_tags_tag_text ON rampage_tags (tag_text);
+CREATE UNIQUE INDEX rampage_tags_tag_name ON rampage_tags (tag_name);
 
 CREATE TABLE rampage_tagged (
   user_id INTEGER NOT NULL,
@@ -61,9 +61,9 @@ INSERT INTO rampage_objects (object_id, object_name, type_id) VALUES (2, 'office
 INSERT INTO rampage_objects (object_id, object_name, type_id) VALUES (3, 'huffington post', 2);
 INSERT INTO rampage_objects (object_id, object_name, type_id) VALUES (4, 'daring fireball', 2);
 
-INSERT INTO rampage_users (user_id, user_username) VALUES (1, 'alice');
-INSERT INTO rampage_users (user_id, user_username) VALUES (2, 'bob');
+INSERT INTO rampage_users (user_id, user_name) VALUES (1, 'alice');
+INSERT INTO rampage_users (user_id, user_name) VALUES (2, 'bob');
 
-INSERT INTO rampage_tags (tag_id, tag_text) VALUES (1, 'work');
-INSERT INTO rampage_tags (tag_id, tag_text) VALUES (2, 'play');
-INSERT INTO rampage_tags (tag_id, tag_text) VALUES (3, 'apple');
+INSERT INTO rampage_tags (tag_id, tag_name) VALUES (1, 'work');
+INSERT INTO rampage_tags (tag_id, tag_name) VALUES (2, 'play');
+INSERT INTO rampage_tags (tag_id, tag_name) VALUES (3, 'apple');