Improve tests

chalasr · chalasr · commit daab5d1b4354 · 2016-05-24T22:24:10.000+02:00
Fix wrong phpdoc
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -139,9 +139,9 @@ public function getStatusCode()
     }
 
     /**
-     * Sets the faked user inputs.
+     * Sets the user inputs.
      *
-     * @param array $inputs
+     * @param array
      *
      * @return CommandTester
      */
@@ -153,9 +153,9 @@ public function setUserInputs(array $inputs)
     }
 
     /**
-     * Gets the faked user inputs.
+     * Gets the user inputs.
      *
-     * @return array $inputs
+     * @return array
      */
     public function getUserInputs()
     {
diff --git a/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php b/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php
@@ -85,18 +85,52 @@ public function testCommandFromApplication()
 
     public function testCommandWithUserInputs()
     {
-        $question = 'What\'s your name?';
+        $questions = array(
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?'
+        );
+        $command = new Command('foo');
+
+        $command->setCode(function ($input, $output) use ($questions, $command) {
+            $helper = $command->getHelper('question');
+            $helper->ask($input, $output, new Question($questions[0]));
+            $helper->ask($input, $output, new Question($questions[1]));
+            $helper->ask($input, $output, new Question($questions[2]));
+        });
+
+        $tester = new CommandTester($command);
+        $tester->setUserInputs(array('Bobby', 'Fine', 'France'));
+        $tester->execute(array());
+
+        $this->assertEquals(0, $tester->getStatusCode());
+        $this->assertEquals(implode('', $questions), $tester->getDisplay());
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedMessage   Aborted
+     */
+    public function testCommandWithWrongNumberOfUserInputs()
+    {
+        $questions = array(
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?'
+        );
 
         $command = new Command('foo');
-        $command->setCode(function ($input, $output) use ($question, $command) {
-            $command->getHelper('question')->ask($input, $output, new Question($question));
+        $command->setCode(function ($input, $output) use ($questions, $command) {
+            $helper = $command->getHelper('question');
+            $helper->ask($input, $output, new Question($questions[0]));
+            $helper->ask($input, $output, new Question($questions[1]));
+            $helper->ask($input, $output, new Question($questions[2]));
         });
 
         $tester = new CommandTester($command);
-        $tester->setUserInputs(array('Bobby'));
+        $tester->setUserInputs(array('Bobby', 'Fine'));
+        $tester->execute(array());
 
-        $this->assertEquals(0, $tester->execute(array()));
-        $this->assertEquals($question, $tester->getDisplay(true));
-        $this->assertInternalType('resource', $command->getHelper('question')->getInputStream());
+        $this->assertEquals(implode('', $questions), $tester->getDisplay());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,9 @@ public function getStatusCode()`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/**`
`142`		`- * Sets the faked user inputs.`
	`142`	`+ * Sets the user inputs.`
`143`	`143`	`*`
`144`		`- * @param array $inputs`
	`144`	`+ * @param array`
`145`	`145`	`*`
`146`	`146`	`* @return CommandTester`
`147`	`147`	`*/`
`@@ -153,9 +153,9 @@ public function setUserInputs(array $inputs)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/**`
`156`		`- * Gets the faked user inputs.`
	`156`	`+ * Gets the user inputs.`
`157`	`157`	`*`
`158`		`- * @return array $inputs`
	`158`	`+ * @return array`
`159`	`159`	`*/`
`160`	`160`	`public function getUserInputs()`
`161`	`161`	`{`