- Fixed issue #16055: Corrected regression in error message for option

dependencies. - Fixed error message spelling. git-svn-id: http://svn.ez.no/svn/ezcomponents/trunk@11350 bc0e7bdc-f0fc-0310-8ff6-f601c06e1256
xmak · Jan 21, 2010 · f4ecc7f · f4ecc7f
1 parent 47a04da
commit f4ecc7f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/ConsoleTools/ChangeLog b/ConsoleTools/ChangeLog
@@ -1,3 +1,10 @@
+1.6.1 - [RELEASEDATE]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Fixed issue #16055: Corrected regression in error message for option
+  dependencies.
+
+
 1.6 - Monday 21 December 2009
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/ConsoleTools/src/exceptions/option_dependency_violation.php b/ConsoleTools/src/exceptions/option_dependency_violation.php
@@ -30,7 +30,7 @@ public function __construct( ezcConsoleOption $dependingOption, ezcConsoleOption
         $message  = "The option '{$dependingOption->long}' depends on the option '{$dependantOption->long}' ";
         if ( $valueRange !== null )
         {
-            $message .= " to have a value in '{$valueRange}' ";
+            $message .= "to have a value in '{$valueRange}' ";
         }
         $message .= "but this one was not submitted.";
         parent::__construct( $message );

diff --git a/ConsoleTools/src/input/validators/standard.php b/ConsoleTools/src/input/validators/standard.php
@@ -95,8 +95,7 @@ private function validateDependency( ezcConsoleOption $srcOpt, ezcConsoleOptionR
         {
             throw new ezcConsoleOptionDependencyViolationException(
                 $srcOpt,
-                $dep->option,
-                implode( ', ', $dep->values )
+                $dep->option
             );
         }
 

diff --git a/ConsoleTools/tests/input_test.php b/ConsoleTools/tests/input_test.php
@@ -1702,7 +1702,11 @@ public function testProcessFailureDependencies()
             'moretext',
             '-c'            // This one depends on -t, -o, -b and -y
         );
-        $this->commonProcessTestFailure( $args, 'ezcConsoleOptionDependencyViolationException' );
+        $this->commonProcessTestFailure(
+            $args,
+            'ezcConsoleOptionDependencyViolationException',
+            "The option 'console' depends on the option 'original' but this one was not submitted."
+        );
     }
 
     public function testProcessFailureDependencieValues()
@@ -1719,7 +1723,11 @@ public function testProcessFailureDependencieValues()
             '-x',
         );
 
-        $this->commonProcessTestFailure( $args, 'ezcConsoleOptionDependencyViolationException' );
+        $this->commonProcessTestFailure(
+            $args,
+            'ezcConsoleOptionDependencyViolationException',
+            "The option 'execute' depends on the option 'yank' to have a value in 'foo, bar' but this one was not submitted."
+        );
     }
 
     public function testProcessFailureExclusions()
@@ -2854,7 +2862,7 @@ private function commonProcessTestSuccess( $args, $res )
         $this->assertTrue( count( array_diff( $res, $values ) ) == 0, 'Parameters processed incorrectly.' );
     }
 
-    private function commonProcessTestFailure( $args, $exceptionClass )
+    private function commonProcessTestFailure( $args, $exceptionClass, $message = null )
     {
         try 
         {
@@ -2867,6 +2875,15 @@ private function commonProcessTestFailure( $args, $exceptionClass )
                 get_class( $e ),
                 'Wrong exception thrown for invalid parameter submission. Expected class <'.$exceptionClass.'>, received <'.get_class( $e ).'>'
             );
+
+            if ( $message !== null )
+            {
+                $this->assertEquals(
+                    $message,
+                    $e->getMessage(),
+                    'Exception message incorrect.'
+                );
+            }
             return;
         }
         $this->fail( 'Exception not thrown for invalid parameter submition.' );