diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-12 11:26:25 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-12 11:26:25 +0100 |
| commit | 50518a3887776b0b2b67f445cc0434017e9b71f6 (patch) | |
| tree | 49e643932312cdceb89d9168ed582e21769d0ea7 | |
| parent | 942a1d87aecbee7ffc57e6eae19cf5e90688b8dc (diff) | |
| parent | d24652d4ef8232fa6cfd675aa80d1e182073a220 (diff) | |
Merge pull request #3468 from dbernar1/test-5.2
Added support for running unit tests on PHP 5.2
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | tests/codeigniter/core/Output_test.php | 23 | ||||
| -rw-r--r-- | tests/mocks/database/schema/skeleton.php | 34 |
3 files changed, 35 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index 49c092d4b..3a823f7b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: php php: + - 5.2 - 5.3.3 - 5.4 - 5.5 @@ -19,7 +20,7 @@ env: sudo: false before_script: - - composer install --dev --no-progress + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear channel-discover pear.bovigo.org && pear install bovigo/vfsStream-beta; else composer install --dev --no-progress; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi" @@ -34,6 +35,10 @@ matrix: env: DB=pgsql - php: hhvm env: DB=pdo/pgsql + - php: 5.2 + env: DB=sqlite + - php: 5.2 + env: DB=pdo/sqlite branches: only: diff --git a/tests/codeigniter/core/Output_test.php b/tests/codeigniter/core/Output_test.php index a06c17045..887c077d7 100644 --- a/tests/codeigniter/core/Output_test.php +++ b/tests/codeigniter/core/Output_test.php @@ -3,19 +3,20 @@ class Output_test extends CI_TestCase { public $output; - protected $_output_data = <<<HTML -<html> - <head> - <title>Basic HTML</title> - </head> - <body> - Test - </body> -</html> -HTML; + protected $_output_data = ''; public function set_up() { + $this->_output_data =<<<HTML + <html> + <head> + <title>Basic HTML</title> + </head> + <body> + Test + </body> + </html> +HTML; $this->ci_set_config('charset', 'UTF-8'); $output = $this->ci_core_class('output'); $this->output = new $output(); @@ -59,4 +60,4 @@ HTML; ); } -}
\ No newline at end of file +} diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php index e5c536090..b6d4b7893 100644 --- a/tests/mocks/database/schema/skeleton.php +++ b/tests/mocks/database/schema/skeleton.php @@ -22,7 +22,7 @@ class Mock_Database_Schema_Skeleton { */ public static function init($driver) { - if (empty(static::$db) && empty(static::$forge)) + if (empty(self::$db) && empty(self::$forge)) { $config = Mock_Database_DB::config($driver); $connection = new Mock_Database_DB($config); @@ -34,12 +34,12 @@ class Mock_Database_Schema_Skeleton { $loader->dbforge(); $forge = CI_TestCase::instance()->ci_instance_var('dbforge'); - static::$db = $db; - static::$forge = $forge; - static::$driver = $driver; + self::$db = $db; + self::$forge = $forge; + self::$driver = $driver; } - return static::$db; + return self::$db; } /** @@ -50,7 +50,7 @@ class Mock_Database_Schema_Skeleton { public static function create_tables() { // User Table - static::$forge->add_field(array( + self::$forge->add_field(array( 'id' => array( 'type' => 'INTEGER', 'constraint' => 3 @@ -68,11 +68,11 @@ class Mock_Database_Schema_Skeleton { 'constraint' => 40 ) )); - static::$forge->add_key('id', TRUE); - static::$forge->create_table('user', TRUE); + self::$forge->add_key('id', TRUE); + self::$forge->create_table('user', TRUE); // Job Table - static::$forge->add_field(array( + self::$forge->add_field(array( 'id' => array( 'type' => 'INTEGER', 'constraint' => 3 @@ -85,11 +85,11 @@ class Mock_Database_Schema_Skeleton { 'type' => 'TEXT' ) )); - static::$forge->add_key('id', TRUE); - static::$forge->create_table('job', TRUE); + self::$forge->add_key('id', TRUE); + self::$forge->create_table('job', TRUE); // Misc Table - static::$forge->add_field(array( + self::$forge->add_field(array( 'id' => array( 'type' => 'INTEGER', 'constraint' => 3 @@ -102,8 +102,8 @@ class Mock_Database_Schema_Skeleton { 'type' => 'TEXT' ) )); - static::$forge->add_key('id', TRUE); - static::$forge->create_table('misc', TRUE); + self::$forge->add_key('id', TRUE); + self::$forge->create_table('misc', TRUE); } /** @@ -136,13 +136,13 @@ class Mock_Database_Schema_Skeleton { foreach ($data as $table => $dummy_data) { - static::$db->truncate($table); + self::$db->truncate($table); foreach ($dummy_data as $single_dummy_data) { - static::$db->insert($table, $single_dummy_data); + self::$db->insert($table, $single_dummy_data); } } } -}
\ No newline at end of file +} |