Miletone/Exceptions

- Cleaned up names & tests in Zend\Log for merge
zendframework · Oct 5, 2010 · 3894dbf · 3894dbf
2 parents cf8b9cd + 49f0790
commit 3894dbf
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 56 deletions.
diff --git a/src/Filter/AbstractFilter.php b/src/Filter/AbstractFilter.php
@@ -54,7 +54,7 @@ static protected function _parseConfig($config)
         }
 
         if (!is_array($config)) {
-            throw new \Zend\Log\Exception\InvalidArgumentException('Configuration must be an array or instance of Zend\\Config\\Config');
+            throw new \Zend\Log\Exception\InvalidArgumentException('Configuration must be an array or instance of Zend\Config\Config');
         }
 
         return $config;

diff --git a/src/Logger.php b/src/Logger.php
@@ -215,7 +215,7 @@ protected function _constructFromConfig($type, $config, $namespace)
 
         if (!is_array($config) || empty($config)) {
             throw new Exception\InvalidArgumentException(
-                'Configuration must be an array or instance of Zend\\Config\\Config'
+                'Configuration must be an array or instance of Zend\Config\Config'
             );
         }
 
@@ -443,7 +443,7 @@ public function addWriter($writer)
 
         if (!$writer instanceof Writer) {
             throw new Exception\InvalidArgumentException(
-                'Writer must be an instance of Zend\\Log\\Writer'
+                'Writer must be an instance of Zend\Log\Writer'
                 . ' or you should pass a configuration array'
             );
         }

diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
@@ -134,7 +134,7 @@ static protected function _parseConfig($config)
 
         if (!is_array($config)) {
             throw new \Zend\Log\Exception\InvalidArgumentException(
-				'Configuration must be an array or instance of Zend\\Config\\Config'
+				'Configuration must be an array or instance of Zend\Config\Config'
 			);
         }
 

diff --git a/src/Writer/Mail.php b/src/Writer/Mail.php
@@ -129,7 +129,7 @@ public function __construct(\Zend\Mail\Mail $mail, \Zend\Layout\Layout $layout =
      */
     static public function factory($config = array())
     {
-        throw new Log\Exception\NotImplementedException('Zend\\Log\\Writer\\Mail does not currently implement a factory');
+        throw new Log\Exception\NotImplementedException('Zend\Log\Writer\Mail does not currently implement a factory');
     }
 
     /**
@@ -195,7 +195,7 @@ public function setLayoutFormatter(Log\Formatter $formatter)
         if (!$this->_layout) {
             throw new Log\Exception\InvalidArgumentException(
                 'cannot set formatter for layout; ' .
-                    'a Zend_Layout instance is not in use');
+                    'a Zend\Layout\Layout instance is not in use');
         }
 
         $this->_layoutFormatter = $formatter;

diff --git a/test/Filter/MessageTest.php b/test/Filter/MessageTest.php
@@ -38,7 +38,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase
 {
     public function testMessageFilterRecognizesInvalidRegularExpression()
     {
-        $this->setExpectedException('\\Zend\\Log\\Exception\\InvalidArgumentException', 'invalid reg');
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'invalid reg');
         $filter = new Message('invalid regexp');
     }
 

diff --git a/test/Filter/PriorityTest.php b/test/Filter/PriorityTest.php
@@ -57,7 +57,7 @@ public function testComparisonOperatorCanBeChanged()
 
     public function testConstructorThrowsOnInvalidPriority()
     {
-        $this->setExpectedException('\Zend\Log\Exception\InvalidArgumentException', 'must be an integer');
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'must be an integer');
         new Priority('foo');
     }
 
@@ -78,7 +78,7 @@ public function testFactory()
 
     public function testFactoryRaisesExceptionWithInvalidPriority()
     {
-        $this->setExpectedException('\Zend\Log\Exception\InvalidArgumentException', 'must be an integer');
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'must be an integer');
         $logger = Logger::factory(array('Null' => array(
             'writerName'   => 'Mock',
             'filterName'   => 'Priority',

diff --git a/test/Formatter/SimpleTest.php b/test/Formatter/SimpleTest.php
@@ -36,7 +36,7 @@ class SimpleTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructorThrowsOnBadFormatString()
     {
-        $this->setExpectedException('\Zend\Log\Exception\InvalidArgumentException', 'must be a string');
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'must be a string');
         new Simple(1);
     }
 

diff --git a/test/LoggerTest.php b/test/LoggerTest.php
@@ -354,29 +354,23 @@ public function testLogWritesWithModifiedTimestampFormat()
      */
     public function testExceptionConstructWriterFromConfig()
     {
-        try {
-            $logger = new Logger();
-            $writer = array('writerName' => 'NotExtendedWriterAbstract');
-            $logger->addWriter($writer);
-        } catch (\Exception $e) {
-            $this->assertType('Zend\Log\Exception\InvalidArgumentException', $e);
-            $this->assertRegExp('#^(Zend\\\\Log\\\\Writer\\\\NotExtendedWriterAbstract|The\sspecified\swriter)#', $e->getMessage());
-        }
+        $logger = new Logger();
+        $writer = array('writerName' => 'NotExtendedWriterAbstract');
+
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'The specified writer does not extend Zend\Log\Writer');
+        $logger->addWriter($writer);
     }
 
     /**
      * @group ZF-9956
      */
     public function testExceptionConstructFilterFromConfig()
     {
-        try {
-            $logger = new Logger();
-            $filter = array('filterName' => 'NotImplementsFilterInterface');
-            $logger->addFilter($filter);
-        } catch (\Exception $e) {
-            $this->assertType('Zend\Log\Exception\InvalidArgumentException', $e);
-            $this->assertRegExp('#^(Zend\\\\Log\\\\Filter\\\\NotImplementsFilterInterface|The\sspecified\sfilter)#', $e->getMessage());
-        }
+        $logger = new Logger();
+        $filter = array('filterName' => 'NotImplementsFilterInterface');
+
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'The specified filter does not implement Zend\Log\Filter');
+        $logger->addFilter($filter);
     }
 
     /**
@@ -396,29 +390,31 @@ public function testFluentInterface()
     /**
      * @group ZF-10170
      */
-    public function testPriorityDuplicates()
+    public function testExceptionIsThrownOnPriorityDuplicates()
     {
         $logger   = new Logger();
         $mock     = new Log\Writer\Mock();
         $logger->addWriter($mock);
-        try {
-            $logger->addPriority('emerg', 8);
-            $this->fail();
-        } catch(\Exception $e) {
-            $this->assertType('Zend\Log\Exception\InvalidArgumentException', $e);
-            $this->assertEquals('Existing priorities cannot be overwritten', $e->getMessage());
-        }
-
-        try {
-            $logger->log('zf10170', 0);
-            $logger->log('clone zf10170', 8);
-            $this->fail();
-        } catch (\Exception $e) {
-            $this->assertType('Zend\Log\Exception\InvalidArgumentException', $e);
-            $this->assertEquals('Bad log priority', $e->getMessage());
-        }
+
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'Existing priorities cannot be overwritten');
+        $logger->addPriority('emerg', 8);
+    }
+
+    /**
+     * @group ZF-10170
+     */
+    public function testExceptionIsThrownOnInvalidLogPriority()
+    {
+        $logger   = new Logger();
+        $mock     = new Log\Writer\Mock();
+        $logger->addWriter($mock);
+        $logger->log('zf10170', 0);
+
         $this->assertEquals(0, $mock->events[0]['priority']);
         $this->assertEquals('EMERG', $mock->events[0]['priorityName']);
         $this->assertFalse(array_key_exists(1, $mock->events));
+
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'Bad log priority');
+        $logger->log('clone zf10170', 8);
     }
 }
diff --git a/test/Writer/DbTest.php b/test/Writer/DbTest.php
@@ -45,7 +45,7 @@ public function setUp()
 
     public function testFormattingIsNotSupported()
     {
-        $this->setExpectedException('\Zend\Log\Exception\InvalidArgumentException', 'does not support formatting');
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'does not support formatting');
         $this->writer->setFormatter(new \Zend\Log\Formatter\Simple);
     }
 
@@ -95,7 +95,7 @@ public function testShutdownRemovesReferenceToDatabaseInstance()
         $this->writer->write(array('message' => 'this should not fail'));
         $this->writer->shutdown();
 
-        $this->setExpectedException('\Zend\Log\Exception\RuntimeException', 'Database adapter is null');
+        $this->setExpectedException('Zend\Log\Exception\RuntimeException', 'Database adapter is null');
         $this->writer->write(array('message' => 'this should fail'));
     }
 
@@ -119,12 +119,7 @@ public function testFactory()
     public function testThrowStrictSetFormatter()
     {
     	$this->setExpectedException('PHPUnit_Framework_Error');
-//        try {
-            $this->writer->setFormatter(new \StdClass());
-//        } catch (Exception $e) {
-//            $this->assertType('PHPUnit_Framework_Error', $e);
-//            $this->assertContains('must implement interface', $e->getMessage());
-//        }
+        $this->writer->setFormatter(new \StdClass());
     }
 }
 

diff --git a/test/Writer/StreamTest.php b/test/Writer/StreamTest.php
@@ -43,7 +43,7 @@ public function testConstructorThrowsWhenResourceIsNotStream()
             new StreamWriter($resource);
             $this->fail();
         } catch (\Exception $e) {
-            $this->assertType('\Zend\Log\Exception\InvalidArgumentException', $e);
+            $this->assertType('Zend\Log\Exception\InvalidArgumentException', $e);
             $this->assertRegExp('/not a stream/i', $e->getMessage());
         }
         xml_parser_free($resource);
@@ -63,13 +63,13 @@ public function testConstructorWithValidUrl()
     public function testConstructorThrowsWhenModeSpecifiedForExistingStream()
     {
         $stream = fopen('php://memory', 'w+');
-        $this->setExpectedException('\Zend\Log\Exception\InvalidArgumentException', 'existing stream');
+        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException', 'existing stream');
         new StreamWriter($stream, 'w+');
     }
 
     public function testConstructorThrowsWhenStreamCannotBeOpened()
     {
-        $this->setExpectedException('\Zend\Log\Exception\RuntimeException', 'cannot be opened');
+        $this->setExpectedException('Zend\Log\Exception\RuntimeException', 'cannot be opened');
         new StreamWriter('');
     }
 
@@ -94,7 +94,7 @@ public function testWriteThrowsWhenStreamWriteFails()
         $writer = new StreamWriter($stream);
         fclose($stream);
 
-        $this->setExpectedException('\Zend\Log\Exception\RuntimeException', 'Unable to write');
+        $this->setExpectedException('Zend\Log\Exception\RuntimeException', 'Unable to write');
         $writer->write(array('message' => 'foo'));
     }
 
@@ -105,7 +105,7 @@ public function testShutdownClosesStreamResource()
 
         $writer->shutdown();
 
-        $this->setExpectedException('\Zend\Log\Exception\RuntimeException', 'Unable to write');
+        $this->setExpectedException('Zend\Log\Exception\RuntimeException', 'Unable to write');
         $writer->write(array('message' => 'this write should fail'));
     }