Skip to content

Commit 1c46461

Browse files
kenjiskenjis
committed
Merge branch 'ftwbzhao-feature/command'
2 parents 805bedc + 7c15d2c commit 1c46461

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎tests/Command/GenerateTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function test_no_generator()
2828
$this->assertEquals(Status::FAILURE, $status);
2929

3030
$this->stderr->rewind();
31-
$actual = $this->stderr->fread(8192);
31+
$actual = $this->stderr->fread();
3232
$expected = 'No such generator class: Kenjis\CodeIgniter_Cli\Command\Generate\Not_exists' . PHP_EOL;
3333
$this->assertEquals($expected, $actual);
3434
}
@@ -39,7 +39,7 @@ public function test_migration_no_classname()
3939
$this->assertEquals(Status::USAGE, $status);
4040

4141
$this->stderr->rewind();
42-
$actual = $this->stderr->fread(8192);
42+
$actual = $this->stderr->fread();
4343
$expected = 'Classname is needed' . PHP_EOL
4444
. ' eg, generate migration CreateUserTable' . PHP_EOL;
4545
$this->assertEquals($expected, $actual);
@@ -80,7 +80,7 @@ public function test_migration_cannot_write_to_file()
8080
$this->assertEquals(Status::FAILURE, $status);
8181

8282
$this->stderr->rewind();
83-
$actual = $this->stderr->fread(8192);
83+
$actual = $this->stderr->fread();
8484
$this->assertContains("Can't write to ", $actual);
8585
$this->assertContains('Fake/migrations/not-exist-dir/', $actual);
8686
$this->assertContains('Test_of_generate_migration.php', $actual);

‎tests/Command/MigrateTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public function test_command_not_exists()
3838
$this->assertEquals(Status::USAGE, $status);
3939

4040
$this->stderr->rewind();
41-
$actual = $this->stderr->fread(8192);
41+
$actual = $this->stderr->fread();
4242
$expected = 'No such command: command-not-exists' . PHP_EOL;
4343
$this->assertEquals($expected, $actual);
4444
}
4545

4646
public function test_migrate()
4747
{
4848
$status = $this->cmd->__invoke();
49-
$this->assertEquals(0, $status);
49+
$this->assertEquals(Status::SUCCESS, $status);
5050
}
5151

5252
public function test_migrate_to_version_not_exists()
@@ -58,16 +58,16 @@ public function test_migrate_to_version_not_exists()
5858
public function test_migrate_to_specific_version()
5959
{
6060
$status = $this->cmd->__invoke('20150429110003');
61-
$this->assertEquals(0, $status);
61+
$this->assertEquals(Status::SUCCESS, $status);
6262
}
6363

6464
public function test_status()
6565
{
6666
$status = $this->cmd->__invoke('status');
67-
$this->assertEquals(0, $status);
67+
$this->assertEquals(Status::SUCCESS, $status);
6868

6969
$this->stdout->rewind();
70-
$actual = $this->stdout->fread(8192);
70+
$actual = $this->stdout->fread();
7171
$this->assertContains('20150429090001_Create_bbs.php', $actual);
7272
$this->assertContains('20150429110003_Create_category.php (current/database)', $actual);
7373
}
@@ -76,21 +76,21 @@ public function test_status_current_not_equals_database()
7676
{
7777
$this->ci->config->set_item('migration_version', 20150429120004);
7878
$status = $this->cmd->__invoke('status');
79-
$this->assertEquals(0, $status);
79+
$this->assertEquals(Status::SUCCESS, $status);
8080

8181
$this->stdout->rewind();
82-
$actual = $this->stdout->fread(8192);
82+
$actual = $this->stdout->fread();
8383
$this->assertContains('20150429110003_Create_category.php (database)', $actual);
8484
$this->assertContains('20150429120004_Create_product.php (current)', $actual);
8585
}
8686

8787
public function test_version()
8888
{
8989
$status = $this->cmd->__invoke('version');
90-
$this->assertEquals(0, $status);
90+
$this->assertEquals(Status::SUCCESS, $status);
9191

9292
$this->stdout->rewind();
93-
$actual = $this->stdout->fread(8192);
93+
$actual = $this->stdout->fread();
9494
$this->assertContains(' current: 20150429110003 (in config/migration.php)', $actual);
9595
$this->assertContains('database: 20150429110003 (in database table)', $actual);
9696
$this->assertContains(' latest: 20150429120004 (in migration files)', $actual);

‎tests/Command/RunTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function test_run_no_controller()
2828
$this->assertEquals(Status::USAGE, $status);
2929

3030
$this->stderr->rewind();
31-
$actual = $this->stderr->fread(8192);
31+
$actual = $this->stderr->fread();
3232
$expected = 'Controller is needed' . PHP_EOL;
3333
$this->assertEquals($expected, $actual);
3434
}
@@ -38,10 +38,10 @@ public function test_run_welcome()
3838
ob_start();
3939
$status = $this->cmd->__invoke('welcome');
4040
ob_end_clean();
41-
$this->assertEquals(0, $status);
41+
$this->assertEquals(Status::SUCCESS, $status);
4242

4343
$this->stdout->rewind();
44-
$actual = $this->stdout->fread(8192);
44+
$actual = $this->stdout->fread();
4545
$expected = 'php public/index.php welcome';
4646
$this->assertContains($expected, $actual);
4747
}

‎tests/Command/SeedTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ public function test_seed()
2929
{
3030
$this->expectOutputString('Table1SeederTable2SeederTable1Seeder');
3131
$status = $this->cmd->__invoke();
32-
$this->assertEquals(0, $status);
32+
$this->assertEquals(Status::SUCCESS, $status);
3333

3434
$this->stdout->rewind();
35-
$actual = $this->stdout->fread(8192);
35+
$actual = $this->stdout->fread();
3636
$expected = 'Seeded: Table1Seeder' . PHP_EOL
3737
. 'Seeded: Table2Seeder' . PHP_EOL
3838
. 'Seeded: Table1Seeder' . PHP_EOL
@@ -44,10 +44,10 @@ public function test_seed_specific_class()
4444
{
4545
$this->expectOutputString('Table1Seeder');
4646
$status = $this->cmd->__invoke('Table1Seeder');
47-
$this->assertEquals(0, $status);
47+
$this->assertEquals(Status::SUCCESS, $status);
4848

4949
$this->stdout->rewind();
50-
$actual = $this->stdout->fread(8192);
50+
$actual = $this->stdout->fread();
5151
$expected = 'Seeded: Table1Seeder' . PHP_EOL;
5252
$this->assertEquals($expected, $actual);
5353
}
@@ -65,10 +65,10 @@ public function test_seed_list()
6565
$this->cmd->setSeederPath($this->seeder_path);
6666

6767
$status = $this->cmd->__invoke();
68-
$this->assertEquals(0, $status);
68+
$this->assertEquals(Status::SUCCESS, $status);
6969

7070
$this->stdout->rewind();
71-
$actual = $this->stdout->fread(8192);
71+
$actual = $this->stdout->fread();
7272
$this->assertContains('Table1Seeder', $actual);
7373
$this->assertContains('Table2Seeder', $actual);
7474
}

‎tests/UserConfigTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function test_registerCommandClasses()
3333
$ci = new \stdClass();
3434
$paths = [ __DIR__ . '/Fake/user_commands/' ];
3535
UserConfig::registerCommandClasses($this->di, $ci, $paths);
36-
36+
3737
$this->assertTrue(array_key_exists('TestCommand', $this->di->params));
3838
}
3939

@@ -42,10 +42,10 @@ public function test_registerCommandClasses_bad_classname()
4242
$ci = new \stdClass();
4343
$paths = [ __DIR__ . '/Fake/user_commands_bad/' ];
4444
UserConfig::registerCommandClasses($this->di, $ci, $paths);
45-
45+
4646
$stderr = $this->di->get('aura/cli-kernel:stdio')->getStderr();
4747
$stderr->rewind();
48-
$actual = $stderr->fread(8192);
48+
$actual = $stderr->fread();
4949
$expected = 'No such class: BadCommand';
5050
$this->assertContains($expected, $actual);
5151
}
@@ -66,7 +66,7 @@ public function test_registerCommands()
6666
$help_service = $this->di->get('aura/cli-kernel:help_service');
6767
$paths = [ __DIR__ . '/Fake/user_commands/' ];
6868
UserConfig::registerCommands($this->di, $dispatcher, $help_service, $paths);
69-
69+
7070
$this->assertTrue($dispatcher->hasObject('test'));
7171
$this->assertTrue($help_service->has('test'));
7272
}

0 commit comments

Comments
 (0)