Changeset 19802 for branches/version-2_5-dev/test

Timestamp:

2010/12/31 10:46:42 (16 years ago)

Author:

Seasoft

Message:

#834(パラメータの定数名に「URL」を含むにもかかわらず、パスのみのものがある) 一部改修

File:

• branches/version-2_5-dev/test/class/page/LC_Page_Test.php (modified) (6 diffs)

branches/version-2_5-dev/test/class/page/LC_Page_Test.php

@@ -49 +49 @@
     function testSendRedirect() {
         $objPage = new LC_Page();
-        $result = $objPage->sendRedirect(SITE_URL);
+        $result = $objPage->sendRedirect(HTTP_URL);
 
         $this->assertEquals(true, empty($result));
@@ -143 +143 @@
         $url = $objPage->getLocation("/abouts/index.php");
 
-        $this->assertEquals(SITE_URL . "abouts/index.php", $url);
+        $this->assertEquals(HTTP_URL . "abouts/index.php", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
@@ -155 +155 @@
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
-        $url = $objPage->getLocation(URL_DIR . 'abouts/index.php');
-
-        $this->assertEquals(SITE_URL . "abouts/index.php", $url);
+        $url = $objPage->getLocation(URL_PATH . 'abouts/index.php');
+
+        $this->assertEquals(HTTP_URL . "abouts/index.php", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
@@ -173 +173 @@
         $url = $objPage->getLocation("/abouts/index.php", $queryString);
 
-        $this->assertEquals(SITE_URL . "abouts/index.php?mode=update&type=text", $url);
-        unset($_SERVER['DOCUMENT_ROOT']);
-    }
-
-    /**
-     * LC_Page::getLocation() のテストケース.
-     *
-     * SSL_URL 使用
+        $this->assertEquals(HTTP_URL . "abouts/index.php?mode=update&type=text", $url);
+        unset($_SERVER['DOCUMENT_ROOT']);
+    }
+
+    /**
+     * LC_Page::getLocation() のテストケース.
+     *
+     * HTTPS_URL 使用
      */
     function testGetLocationUseSSL() {
@@ -189 +189 @@
         $url = $objPage->getLocation("/abouts/index.php", $queryString, true);
 
-        $this->assertEquals(SSL_URL . "abouts/index.php?mode=update&type=text", $url);
+        $this->assertEquals(HTTPS_URL . "abouts/index.php?mode=update&type=text", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
@@ -206 +206 @@
                                      false, $documentRoot);
 
-        $this->assertEquals(SITE_URL . "abouts/index.php", $url);
+        $this->assertEquals(HTTP_URL . "abouts/index.php", $url);
     }
 }