From 69c97a71476e4eaa6c629022fcd4ec7f36d4ec0d Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Wed, 20 Apr 2011 21:44:54 -0400 Subject: Adding early bootstrap ideas for core test suite --- tests/Bootstrap.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tests/Bootstrap.php (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php new file mode 100644 index 000000000..ca63ff788 --- /dev/null +++ b/tests/Bootstrap.php @@ -0,0 +1,21 @@ + Date: Thu, 21 Apr 2011 00:58:51 -0400 Subject: Removing some lefover code form experimenting with process isolation. --- tests/Bootstrap.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index ca63ff788..5a5eb6458 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -3,18 +3,10 @@ ini_set('display_errors', 1); error_reporting(E_ALL | E_STRICT); -if ( ! defined('PROJECT_BASE')) -{ - define('PROJECT_BASE', realpath(dirname(__FILE__).'/../').'/'); - - define('BASEPATH', PROJECT_BASE.'system/'); - define('APPPATH', PROJECT_BASE.'application/'); -} -// define('EXT', '.php'); - -// @todo provide a way to set various config options - +define('PROJECT_BASE', realpath(dirname(__FILE__).'/../').'/'); +define('BASEPATH', PROJECT_BASE.'system/'); +define('APPPATH', PROJECT_BASE.'application/'); // set up a highly controlled CI environment require_once './lib/common.php'; -- cgit v1.2.3-24-g4f1b From f5aee9d1532b175d2dbfbb66f56e8861f34cd861 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 21 Apr 2011 01:20:40 -0400 Subject: some basic bootstrap cleanup --- tests/Bootstrap.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 5a5eb6458..94dafdce4 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -1,13 +1,20 @@ Date: Thu, 21 Apr 2011 14:34:31 -0500 Subject: Moving tests/codeigniter/helpers/Array_helper_test.php to be lower cased. Adding html_helper_test.php as well. --- tests/Bootstrap.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 94dafdce4..db5ffbd52 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -17,4 +17,12 @@ define('APPPATH', PROJECT_BASE.'application/'); require_once $dir.'/lib/common.php'; require_once $dir.'/lib/ci_testcase.php'; + +// Omit files in the PEAR & PHP Paths from ending up in the coverage report +PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR); +PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR); + +// Omit Tests from the coverage reports. +// PHP_CodeCoverage_Filter::getInstance() + unset($dir); \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 5de50ec2fefc7dad1fd768573ca3f47538fd8988 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 22 Apr 2011 10:02:17 -0500 Subject: Updates to test Bootstrap --- tests/Bootstrap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index db5ffbd52..657671ab0 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -21,8 +21,10 @@ require_once $dir.'/lib/ci_testcase.php'; // Omit files in the PEAR & PHP Paths from ending up in the coverage report PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR); PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR); +PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests'); // Omit Tests from the coverage reports. -// PHP_CodeCoverage_Filter::getInstance() +// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToWhiteList('../system/core'); +PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php'); unset($dir); \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 57d6d2e5c904aae88572aafc2cbcc2ee337d8e4a Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sat, 18 Feb 2012 00:12:51 +0700 Subject: temporary commenting PHP_CodeCoverage_Filter::get_instance() --- tests/Bootstrap.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 657671ab0..28c63f0b2 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -19,12 +19,12 @@ require_once $dir.'/lib/ci_testcase.php'; // Omit files in the PEAR & PHP Paths from ending up in the coverage report -PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR); -PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR); -PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests'); +// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR); +// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR); +// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests'); // Omit Tests from the coverage reports. // PHP_CodeCoverage_Filter::getInstance()->addDirectoryToWhiteList('../system/core'); -PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php'); +// PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php'); unset($dir); \ No newline at end of file -- cgit v1.2.3-24-g4f1b From a03cbc5d2d2747b48be47c6fdef51f338701c583 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Fri, 9 Mar 2012 17:00:56 +0700 Subject: Add tiyowan suggestion #1147 --- tests/Bootstrap.php | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 28c63f0b2..94dafdce4 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -17,14 +17,4 @@ define('APPPATH', PROJECT_BASE.'application/'); require_once $dir.'/lib/common.php'; require_once $dir.'/lib/ci_testcase.php'; - -// Omit files in the PEAR & PHP Paths from ending up in the coverage report -// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR); -// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR); -// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests'); - -// Omit Tests from the coverage reports. -// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToWhiteList('../system/core'); -// PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php'); - unset($dir); \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 8749bc7e836c196dfef37d3b7b5a67736a15092c Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sun, 11 Mar 2012 05:43:45 +0700 Subject: Fix incomplete and skipped test --- tests/Bootstrap.php | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/Bootstrap.php') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 94dafdce4..39c24b219 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -11,6 +11,7 @@ $dir = realpath(dirname(__FILE__)); define('PROJECT_BASE', realpath($dir.'/../').'/'); define('BASEPATH', PROJECT_BASE.'system/'); define('APPPATH', PROJECT_BASE.'application/'); +define('VIEWPATH', PROJECT_BASE.''); // Prep our test environment -- cgit v1.2.3-24-g4f1b