diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-01-12 11:36:45 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-01-12 11:36:45 +0100 |
| commit | 6db62ab0ad0e223806a1367e12b1884b48dc65d7 (patch) | |
| tree | fe3257e417dab12f1f4053308a5a281d0640b721 /tests | |
| parent | c8e1de74b139dc7f3e776f7ebf98495ec5b780a6 (diff) | |
| parent | 5350f056698168061ffde1ba62e8db1715101446 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/codeigniter/core/Output_test.php | 23 | ||||
| -rw-r--r-- | tests/mocks/database/schema/skeleton.php | 34 |
2 files changed, 29 insertions, 28 deletions
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 +} |