Author: grobmeier
Date: Sat May 23 21:47:19 2009
New Revision: 778035

URL: http://svn.apache.org/viewvc?rev=778035&view=rev
Log:
unlink database is now down in teardown

Modified:
    incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php

Modified: 
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php?rev=778035&r1=778034&r2=778035&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php 
(original)
+++ incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php 
Sat May 23 21:47:19 2009
@@ -35,36 +35,36 @@
 
                $dbname = 'appenders/pdotest.sqlite';
                $dsn = 'sqlite:'.$dbname;
-               try {
-                       $database = new PDO($dsn);
-                       $database = null;
-                       
-                       $appender = new LoggerAppenderPDO("myname");
-                       $appender->setDSN($dsn);
-                       $appender->setCreateTable(true);
-                       $appender->activateOptions();
-                       $appender->append($event);
-                       
-                       
-                       $db = $appender->getDatabaseHandle();
-                       $q = "select * from log4php_log";       
-                       $error = "";
-                       if($result = $db->query($q, SQLITE_BOTH, $error)) {
-                               while($row = $result->fetch()) {
-                               self::assertEquals($row['1'], 'TEST');
-                               self::assertEquals($row['2'], 'ERROR');
-                               self::assertEquals($row['3'], 'testmessage');
-                               }
-                       } else {
-                               // todo propagate exception to phpunit
-                          self::assertTrue(false);
-                       }
-                       $appender->close();
-               } catch(Exception $e) {
+
+               $database = new PDO($dsn);
+               $database = null;
+               
+               $appender = new LoggerAppenderPDO("myname");
+               $appender->setDSN($dsn);
+               $appender->setCreateTable(true);
+               $appender->activateOptions();
+               $appender->append($event);
+               
+               
+               $db = $appender->getDatabaseHandle();
+               $q = "select * from log4php_log";       
+               $error = "";
+               if($result = $db->query($q, SQLITE_BOTH, $error)) {
+                       while($row = $result->fetch()) {
+                       self::assertEquals($row['1'], 'TEST');
+                       self::assertEquals($row['2'], 'ERROR');
+                       self::assertEquals($row['3'], 'testmessage');
+                       }
+               } else {
                        // todo propagate exception to phpunit
-                       self::assertTrue(false);
+                  self::assertTrue(false);
                }
-               unlink($dbname);
+               $appender->close();
+               
+    }
+    
+    public function tearDown() {
+        unlink('appenders/pdotest.sqlite');
     }
     
 }


Reply via email to