Changeset 20841 for branches/version-2_11-dev/test

Timestamp:

2011/04/14 20:14:50 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20840

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/design/LC_Page_Admin_Design.php 15680@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 15682@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_MainEdit.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php 16530@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
test/class/util/SC_Utils_Test.php sc_utils_test.php-20100802013957-750m2yralg9cowkd-1
test/require.php require.php-20100726065552-t2b4u96mp8ikqvjf-1

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110414095517-89r4pupac6y68bog

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110414111446-hdoquxfro41iwypa

bzr:revno:

3552

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php ohkouchi@loop-az.jp-20110414095517-89r4pupac6y68bog
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20110414095517-89r4pupac6y68bog
test/class/util/SC_Utils_Test.php ohkouchi@loop-az.jp-20110414095517-89r4pupac6y68bog
test/require.php ohkouchi@loop-az.jp-20110414095517-89r4pupac6y68bog

bzr:timestamp:

2011-04-14 20:14:46.348999977 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-04-14T11:14:46.349000Z

Message:

#1257 (絶対パスかどうかのチェックが Windows 環境を考慮していない)

• SC_Utils::isAbsoluteRealPath() 追加

Location:

branches/version-2_11-dev/test

Files:

• class/util/SC_Utils_Test.php (modified) (6 diffs)
• require.php (modified) (1 diff)

branches/version-2_11-dev/test/class/util/SC_Utils_Test.php

@@ -24 +24 @@
 // {{{ requires
 require_once(realpath(dirname(__FILE__)) . '/../../require.php');
-require_once(realpath(dirname(__FILE__)) . '/../../../data/class/pages/LC_Page_Ex.php');
+require_once(realpath(dirname(__FILE__)) . '/../../../data/class/pages/LC_Page.php');
 
 /**
@@ -46 +46 @@
         $url = "http://www.example.jp/admin/index.php";
 
-        $expected = "http://www.example.jp/admin/index.php";
+        $expected = "http://www.example.jp:/admin/index.php";
         $actual = SC_Utils::getRealURL($url);
 
@@ -55 +55 @@
         $url = "http://www.example.jp/admin/../index.php";
 
-        $expected = "http://www.example.jp/index.php";
+        $expected = "http://www.example.jp:/index.php";
         $actual = SC_Utils::getRealURL($url);
 
@@ -64 +64 @@
         $url = "http://www.example.jp/admin/..///index.php";
 
-        $expected = "http://www.example.jp/index.php";
+        $expected = "http://www.example.jp:/index.php";
         $actual = SC_Utils::getRealURL($url);
 
@@ -73 +73 @@
         $url = "http://www.example.jp/admin/././../index.php";
 
-        $expected = "http://www.example.jp/index.php";
+        $expected = "http://www.example.jp:/index.php";
         $actual = SC_Utils::getRealURL($url);
 
@@ -118 +118 @@
         $this->assertFalse(SC_Utils::isBlank($zero, false));
     }
+
+    function testIsAbsoluteRealPath() {
+        // for *NIX
+        if (strpos(PHP_OS, 'WIN') === false) {
+            $unix_absolute = '/usr/local';
+            $this->assertTrue(SC_Utils::isAbsoluteRealPath($unix_absolute));
+
+            $relative = '../foo/bar';
+            $this->assertFalse(SC_Utils::isAbsoluteRealPath($relative));
+        }
+        // for Win
+        else {
+            $win_absolute = 'C:\Windows\system32';
+            $this->assertTrue(SC_Utils::isAbsoluteRealPath($win_absolute));
+
+            $win_absolute = 'C:/Windows/system32';
+            $this->assertTrue(SC_Utils::isAbsoluteRealPath($win_absolute));
+
+            $relative = '..\\foo\\bar';
+            $this->assertFalse(SC_Utils::isAbsoluteRealPath($relative));
+
+        }
+
+        $empty = '';
+        $this->assertFalse(SC_Utils::isAbsoluteRealPath($empty));
+    }
 }
 ?>

branches/version-2_11-dev/test/require.php

@@ -24 +24 @@
 // {{{ requires
 
-/** PHPUnit/Framework.php のパス(必ずフルパスで指定!) */
-require_once("/opt/local/lib/php/PHPUnit/Framework.php");
-
+/** PHPUnit が含まれる pear ライブラリのパス(必ずフルパスで指定!) */
+$pear_path = '/opt/local/lib/php';
 require_once(realpath(dirname(__FILE__)) . "/../html/require.php");
+set_include_path(get_include_path() . PATH_SEPARATOR . $pear_path);
 ?>