summaryrefslogtreecommitdiff
path: root/modules/tag/tests
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-31 16:07:41 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-31 16:07:41 -0800
commitc050acf30a7351bf0ef5b8ee206704c073e881c7 (patch)
tree93db400f07fe706aa30dc19a59da8580f42f3af0 /modules/tag/tests
parentc6676dd455d070aaded25f048269eee07248100a (diff)
Fix lots of warnings that pop up when we're in E_STRICT mode. They're
mostly issues around uninitialized variables, calling non-static functions in a static context, calling Session functions directly instead of on its singleton, passing non-variables by reference, and subclasses not using the same interface as the parent class.
Diffstat (limited to 'modules/tag/tests')
-rw-r--r--modules/tag/tests/Tag_Item_Rest_Helper_Test.php4
-rw-r--r--modules/tag/tests/Tag_Rest_Helper_Test.php8
-rw-r--r--modules/tag/tests/Tags_Rest_Helper_Test.php4
3 files changed, 15 insertions, 1 deletions
diff --git a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
index 69c580f1..cb368790 100644
--- a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
@@ -28,6 +28,7 @@ class Tag_Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function get_test() {
$tag = tag::add(item::root(), "tag1")->reload();
+ $request = new stdClass();
$request->url = rest::url("tag_item", $tag, item::root());
$this->assert_equal_array(
array("url" => rest::url("tag_item", $tag, item::root()),
@@ -38,6 +39,7 @@ class Tag_Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
}
public function get_with_invalid_url_test() {
+ $request = new stdClass();
$request->url = "bogus";
try {
tag_item_rest::get($request);
@@ -50,6 +52,7 @@ class Tag_Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function delete_test() {
$tag = tag::add(item::root(), "tag1")->reload();
+ $request = new stdClass();
$request->url = rest::url("tag_item", $tag, item::root());
tag_item_rest::delete($request);
@@ -60,7 +63,6 @@ class Tag_Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$album = test::random_album();
$tag = tag::add($album, "tag1")->reload();
-
$tuple = rest::resolve(rest::url("tag_item", $tag, $album));
$this->assert_equal_array($tag->as_array(), $tuple[0]->as_array());
$this->assert_equal_array($album->as_array(), $tuple[1]->as_array());
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index d3cae0fb..838de975 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -28,6 +28,7 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function get_test() {
$tag = tag::add(item::root(), "tag1")->reload();
+ $request = new stdClass();
$request->url = rest::url("tag", $tag);
$this->assert_equal_array(
array("url" => rest::url("tag", $tag),
@@ -41,6 +42,7 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
}
public function get_with_invalid_url_test() {
+ $request = new stdClass();
$request->url = "bogus";
try {
tag_rest::get($request);
@@ -53,6 +55,7 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function get_with_no_relationships_test() {
$tag = test::random_tag();
+ $request = new stdClass();
$request->url = rest::url("tag", $tag);
$this->assert_equal_array(
array("url" => rest::url("tag", $tag),
@@ -72,7 +75,9 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
access::allow(identity::everybody(), "edit", $album);
// Add the album to the tag
+ $request = new stdClass();
$request->url = rest::url("tag", $tag);
+ $request->params = new stdClass();
$request->params->url = rest::url("item", $album);
$this->assert_equal_array(
array("url" => rest::url("tag_item", $tag, $album)),
@@ -93,7 +98,9 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function put_test() {
$tag = test::random_tag();
+ $request = new stdClass();
$request->url = rest::url("tag", $tag);
+ $request->params = new stdClass();
$request->params->name = "new name";
tag_rest::put($request);
@@ -102,6 +109,7 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function delete_tag_test() {
$tag = test::random_tag();
+ $request = new stdClass();
$request->url = rest::url("tag", $tag);
tag_rest::delete($request);
diff --git a/modules/tag/tests/Tags_Rest_Helper_Test.php b/modules/tag/tests/Tags_Rest_Helper_Test.php
index a1713811..cdf7bfdf 100644
--- a/modules/tag/tests/Tags_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tags_Rest_Helper_Test.php
@@ -43,6 +43,8 @@ class Tags_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function post_test() {
access::allow(identity::everybody(), "edit", item::root());
+ $request = new stdClass();
+ $request->params = new stdClass();
$request->params->name = "test tag";
$this->assert_equal(
array("url" => url::site("rest/tag/1")),
@@ -55,6 +57,8 @@ class Tags_Rest_Helper_Test extends Gallery_Unit_Test_Case {
identity::set_active_user(identity::guest());
try {
+ $request = new stdClass();
+ $request->params = new stdClass();
$request->params->name = "test tag";
tags_rest::post($request);
} catch (Exception $e) {