summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/BookmarksTest.php10
-rw-r--r--tests/CommonDescriptionTest.php12
-rw-r--r--tests/SearchTest.php12
-rw-r--r--tests/Tag2TagTest.php10
-rw-r--r--tests/TagsCacheTest.php12
-rw-r--r--tests/TagsTest.php12
6 files changed, 34 insertions, 34 deletions
diff --git a/tests/BookmarksTest.php b/tests/BookmarksTest.php
index fd9ed76..7520058 100644
--- a/tests/BookmarksTest.php
+++ b/tests/BookmarksTest.php
@@ -20,14 +20,14 @@ class BookmarksTest extends PHPUnit_Framework_TestCase
$tableprefix, $TEMPLATES_DIR, $filetypes, $debugMode;
require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
- $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
- $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $this->us =SemanticScuttle_Service_Factory::get('User');
+ $this->bs =SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll();
- $this->b2ts=SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+ $this->b2ts=SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+ $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+ $this->tsts =SemanticScuttle_Service_Factory::get('TagStat');
$this->tsts->deleteAll();
}
diff --git a/tests/CommonDescriptionTest.php b/tests/CommonDescriptionTest.php
index 87d09d1..3f6917e 100644
--- a/tests/CommonDescriptionTest.php
+++ b/tests/CommonDescriptionTest.php
@@ -21,16 +21,16 @@ class CommonDescriptionTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
- $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
- $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $this->us =SemanticScuttle_Service_Factory::get('User');
+ $this->bs =SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+ $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+ $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+ $this->tsts =SemanticScuttle_Service_Factory::get('TagStat');
$this->tsts->deleteAll();
- $this->cds =SemanticScuttle_Service_Factory::getServiceInstance('CommonDescription');
+ $this->cds =SemanticScuttle_Service_Factory::get('CommonDescription');
$this->cds->deleteAll();
}
diff --git a/tests/SearchTest.php b/tests/SearchTest.php
index e03b4d9..3aa49de 100644
--- a/tests/SearchTest.php
+++ b/tests/SearchTest.php
@@ -20,16 +20,16 @@ class SearchTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
- $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
- $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $this->us =SemanticScuttle_Service_Factory::get('User');
+ $this->bs =SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+ $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+ $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+ $this->tsts =SemanticScuttle_Service_Factory::get('TagStat');
$this->tsts->deleteAll();
- $this->shs =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
+ $this->shs =SemanticScuttle_Service_Factory::get('SearchHistory');
$this->shs->deleteAll();
}
diff --git a/tests/Tag2TagTest.php b/tests/Tag2TagTest.php
index 24c0ae1..5445a67 100644
--- a/tests/Tag2TagTest.php
+++ b/tests/Tag2TagTest.php
@@ -19,14 +19,14 @@ class Tag2TagTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
- $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
- $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $this->us =SemanticScuttle_Service_Factory::get('User');
+ $this->bs =SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+ $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+ $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+ $this->tsts =SemanticScuttle_Service_Factory::get('TagStat');
$this->tsts->deleteAll();
}
diff --git a/tests/TagsCacheTest.php b/tests/TagsCacheTest.php
index f401ab6..8e15f2d 100644
--- a/tests/TagsCacheTest.php
+++ b/tests/TagsCacheTest.php
@@ -19,16 +19,16 @@ class TagsCacheTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix, $TEMPLATES_DIR, $debugMode;
require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
- $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
- $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $this->us =SemanticScuttle_Service_Factory::get('User');
+ $this->bs =SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+ $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+ $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+ $this->tsts =SemanticScuttle_Service_Factory::get('TagStat');
$this->tsts->deleteAll();
- $this->tcs =SemanticScuttle_Service_Factory::getServiceInstance('TagCache');
+ $this->tcs =SemanticScuttle_Service_Factory::get('TagCache');
$this->tcs->deleteAll();
}
diff --git a/tests/TagsTest.php b/tests/TagsTest.php
index bb904e1..f07e04f 100644
--- a/tests/TagsTest.php
+++ b/tests/TagsTest.php
@@ -16,16 +16,16 @@ class TagsTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
- $this->ts =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+ $this->ts =SemanticScuttle_Service_Factory::get('Tag');
$this->ts->deleteAll();
- $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
- $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $this->us =SemanticScuttle_Service_Factory::get('User');
+ $this->bs =SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+ $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+ $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+ $this->tsts =SemanticScuttle_Service_Factory::get('TagStat');
$this->tsts->deleteAll();
}