Update tests to match the way that we store server variables in the

comment.  Get rid of comment::update tests since, comment::update is
gone.

Found a bug in comment::create() in the process.. yay unit tests!

1 files changed, 60 insertions, 57 deletions

diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 10903843..ae20b8c0 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -24,6 +24,19 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function setup() {
     $this->_ip_address = Input::instance()->ip_address;
     $this->_user_agent = Kohana::$user_agent;
+
+    $_SERVER["HTTP_ACCEPT"] = "HTTP_ACCEPT";
+    $_SERVER["HTTP_ACCEPT_CHARSET"] = "HTTP_ACCEPT_CHARSET";
+    $_SERVER["HTTP_ACCEPT_ENCODING"] = "HTTP_ACCEPT_ENCODING";
+    $_SERVER["HTTP_ACCEPT_LANGUAGE"] = "HTTP_ACCEPT_LANGUAGE";
+    $_SERVER["HTTP_CONNECTION"] = "HTTP_CONNECTION";
+    $_SERVER["HTTP_HOST"] = "HTTP_HOST";
+    $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
+    $_SERVER["HTTP_USER_AGENT"] = "HTTP_USER_AGENT";
+    $_SERVER["QUERY_STRING"] = "QUERY_STRING";
+    $_SERVER["REMOTE_ADDR"] = "REMOTE_ADDR";
+    $_SERVER["REMOTE_HOST"] = "REMOTE_HOST";
+    $_SERVER["REMOTE_PORT"] = "REMOTE_PORT";
   }
 
   public function teardown() {
@@ -31,74 +44,64 @@ class Comment_Helper_Test extends Unit_Test_Case {
     Kohana::$user_agent = $this->_user_agent;
   }
 
-  public function create_comment_test() {
+  public function create_comment_for_guest_test() {
     $rand = rand();
+    $root = ORM::factory("item", 1);
+    $comment = comment::create(
+      $root, user::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
-    Input::instance()->ip_address = "1.1.1.1";
-    Kohana::$user_agent = "Gallery3 Unit Test";
+    $this->assert_equal("name_$rand", $comment->author_name());
+    $this->assert_equal("email_$rand", $comment->author_email());
+    $this->assert_equal("url_$rand", $comment->author_url());
+    $this->assert_equal("text_$rand", $comment->text);
+    $this->assert_equal(1, $comment->item_id);
 
-    $comment = comment::create($rand, $rand, $rand, $rand, $rand, $rand);
+    $this->assert_equal("REMOTE_ADDR", $comment->server_remote_addr);
+    $this->assert_equal("HTTP_USER_AGENT", $comment->server_http_user_agent);
+    $this->assert_equal("HTTP_ACCEPT", $comment->server_http_accept);
+    $this->assert_equal("HTTP_ACCEPT_CHARSET", $comment->server_http_accept_charset);
+    $this->assert_equal("HTTP_ACCEPT_ENCODING", $comment->server_http_accept_encoding);
+    $this->assert_equal("HTTP_ACCEPT_LANGUAGE", $comment->server_http_accept_language);
+    $this->assert_equal("HTTP_CONNECTION", $comment->server_http_connection);
+    $this->assert_equal("HTTP_HOST", $comment->server_http_host);
+    $this->assert_equal("HTTP_REFERER", $comment->server_http_referer);
+    $this->assert_equal("HTTP_USER_AGENT", $comment->server_http_user_agent);
+    $this->assert_equal("QUERY_STRING", $comment->server_query_string);
+    $this->assert_equal("REMOTE_ADDR", $comment->server_remote_addr);
+    $this->assert_equal("REMOTE_HOST", $comment->server_remote_host);
+    $this->assert_equal("REMOTE_PORT", $comment->server_remote_port);
 
-    $this->assert_equal($rand, $comment->author);
-    $this->assert_equal($rand, $comment->email);
-    $this->assert_equal($rand, $comment->text);
-    $this->assert_equal($rand, $comment->item_id);
-    $this->assert_equal($rand, $comment->url);
-    $this->assert_equal("1.1.1.1", $comment->ip_addr);
-    $this->assert_equal("Gallery3 Unit Test", $comment->user_agent);
     $this->assert_true(!empty($comment->created));
   }
 
-  public function update_comment_test() {
+  public function create_comment_for_user_test() {
     $rand = rand();
-    Input::instance()->ip_address = "1.1.1.1";
-    Kohana::$user_agent = "Gallery3 Unit Test";
-    $comment = comment::create($rand, $rand, $rand, $rand, $rand, $rand);
-
-    $this->assert_equal($rand, $comment->author);
-    $this->assert_equal($rand, $comment->email);
-    $this->assert_equal($rand, $comment->text);
-    $this->assert_equal($rand, $comment->item_id);
-    $this->assert_equal($rand, $comment->url);
-    $this->assert_equal("1.1.1.1", $comment->ip_addr);
-    $this->assert_equal("Gallery3 Unit Test", $comment->user_agent);
-    $this->assert_true(!empty($comment->created));
+    $root = ORM::factory("item", 1);
+    $admin = user::lookup(2);
+    $comment = comment::create(
+      $root, $admin, "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
-    $rand2 = rand();
-    Input::instance()->ip_address = "1.1.1.2";
-    Kohana::$user_agent = "Gallery3 Unit Test New Agent";
-    comment::update($comment, $rand2, $rand2, $rand2, $rand2, $rand2);
-    $this->assert_equal($rand2, $comment->author);
-    $this->assert_equal($rand2, $comment->email);
-    $this->assert_equal($rand2, $comment->text);
-    $this->assert_equal($rand, $comment->item_id);
-    $this->assert_equal("1.1.1.2", $comment->ip_addr);
-    $this->assert_equal($rand2, $comment->url);
-    $this->assert_equal("Gallery3 Unit Test New Agent", $comment->user_agent);
-  }
+    $this->assert_equal($admin->full_name, $comment->author_name());
+    $this->assert_equal($admin->email, $comment->author_email());
+    $this->assert_equal($admin->url, $comment->author_url());
+    $this->assert_equal("text_$rand", $comment->text);
+    $this->assert_equal(1, $comment->item_id);
 
-  public function update_comment_no_change_test() {
-    $rand = rand();
-    Input::instance()->ip_address = "1.1.1.1";
-    Kohana::$user_agent = "Gallery3 Unit Test";
-    $comment = comment::create($rand, $rand, $rand, $rand, $rand, $rand);
+    $this->assert_equal("REMOTE_ADDR", $comment->server_remote_addr);
+    $this->assert_equal("HTTP_USER_AGENT", $comment->server_http_user_agent);
+    $this->assert_equal("HTTP_ACCEPT", $comment->server_http_accept);
+    $this->assert_equal("HTTP_ACCEPT_CHARSET", $comment->server_http_accept_charset);
+    $this->assert_equal("HTTP_ACCEPT_ENCODING", $comment->server_http_accept_encoding);
+    $this->assert_equal("HTTP_ACCEPT_LANGUAGE", $comment->server_http_accept_language);
+    $this->assert_equal("HTTP_CONNECTION", $comment->server_http_connection);
+    $this->assert_equal("HTTP_HOST", $comment->server_http_host);
+    $this->assert_equal("HTTP_REFERER", $comment->server_http_referer);
+    $this->assert_equal("HTTP_USER_AGENT", $comment->server_http_user_agent);
+    $this->assert_equal("QUERY_STRING", $comment->server_query_string);
+    $this->assert_equal("REMOTE_ADDR", $comment->server_remote_addr);
+    $this->assert_equal("REMOTE_HOST", $comment->server_remote_host);
+    $this->assert_equal("REMOTE_PORT", $comment->server_remote_port);
 
-    $this->assert_equal($rand, $comment->author);
-    $this->assert_equal($rand, $comment->email);
-    $this->assert_equal($rand, $comment->text);
-    $this->assert_equal($rand, $comment->item_id);
-    $this->assert_equal($rand, $comment->url);
     $this->assert_true(!empty($comment->created));
-    $this->assert_equal("1.1.1.1", $comment->ip_addr);
-    $this->assert_equal("Gallery3 Unit Test", $comment->user_agent);
-
-    comment::update($comment, $rand, $rand, $rand, $rand, $rand);
-    $this->assert_equal($rand, $comment->author);
-    $this->assert_equal($rand, $comment->email);
-    $this->assert_equal($rand, $comment->text);
-    $this->assert_equal($rand, $comment->item_id);
-    $this->assert_equal($rand, $comment->url);
-    $this->assert_equal("1.1.1.1", $comment->ip_addr);
-    $this->assert_equal("Gallery3 Unit Test", $comment->user_agent);
   }
 }