4106 - in trunk/PersistentObjectDatabaseSchemaTiein: . src tests [eZComponents: Trunk]

Author: Tobias Schlitt
Date: 2006-11-28 14:07:09 +0100 (Tue, 28 Nov 2006)
New Revision: 4106

Log:
- Fixed issue #9623: PersistentObjectDatabaseSchemaTiein's generate should
  handle database exceptions.

Modified:
   trunk/PersistentObjectDatabaseSchemaTiein/ChangeLog
   trunk/PersistentObjectDatabaseSchemaTiein/src/generator.php
   trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php
   trunk/PersistentObjectDatabaseSchemaTiein/tests/test.php

Modified: trunk/PersistentObjectDatabaseSchemaTiein/ChangeLog
===================================================================
--- trunk/PersistentObjectDatabaseSchemaTiein/ChangeLog 2006-11-28 12:31:27 UTC 
(rev 4105)
+++ trunk/PersistentObjectDatabaseSchemaTiein/ChangeLog 2006-11-28 13:07:09 UTC 
(rev 4106)
@@ -6,7 +6,10 @@
 - Fixed issue #9489: Check whether the PersistentObject and
   PersistentObjectDatabaseSchemaTiein tutorials are interlinked.
 - Fixed issue #9515: PersistentObjectDatabaseTiein tests are system dependent.
+- Fixed issue #9623: PersistentObjectDatabaseSchemaTiein's generate should
+  handle database exceptions.
 
+
 1.1beta1 - Monday 20 November 2006
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

Modified: trunk/PersistentObjectDatabaseSchemaTiein/src/generator.php
===================================================================
--- trunk/PersistentObjectDatabaseSchemaTiein/src/generator.php 2006-11-28 
12:31:27 UTC (rev 4105)
+++ trunk/PersistentObjectDatabaseSchemaTiein/src/generator.php 2006-11-28 
13:07:09 UTC (rev 4106)
@@ -196,7 +196,7 @@
                     break;
             }
         }
-        catch ( ezcBaseException $e )
+        catch ( Exception $e )
         {
             $this->raiseError( "Error reading schema: {$e->getMessage()}" );
         }

Modified: trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php
===================================================================
--- trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php    2006-11-28 
12:31:27 UTC (rev 4105)
+++ trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php    2006-11-28 
13:07:09 UTC (rev 4106)
@@ -113,6 +113,10 @@
 
 PersistentObject definition successfully written to';
 
+$res['testInvalidFromDb'] = 'eZ components PersistentObject definition 
generator
+
+Error reading schema: ';
+
 return $res;
 
 ?>

Modified: trunk/PersistentObjectDatabaseSchemaTiein/tests/test.php
===================================================================
--- trunk/PersistentObjectDatabaseSchemaTiein/tests/test.php    2006-11-28 
12:31:27 UTC (rev 4105)
+++ trunk/PersistentObjectDatabaseSchemaTiein/tests/test.php    2006-11-28 
13:07:09 UTC (rev 4106)
@@ -179,5 +179,29 @@
 
         $this->removeTempDir();
     }
+
+    public function testInvalidFromDb()
+    {
+        $type = ezcTestSettings::getInstance()->db->phptype;
+        $dsn = ezcTestSettings::getInstance()->db->dsn;
+
+        if ( $dsn === null || $type === null )
+        {
+            $this->markTestSkipped( "DSN or database type not set" );
+        }
+
+        // manipulate DSN
+        $dsn = preg_replace( "@/[^/]*$@", "/db_not_exists", $dsn );
+
+        // setup this test
+        $destination = $this->createTempDir( "PersObjDatSchem" );
+        
+        // real test
+        $res = `php PersistentObjectDatabaseSchemaTiein/src/rungenerator.php 
-f "$type" -s "$dsn" "$destination"`;
+        
+        $this->assertEquals( $this->results[__FUNCTION__], substr( $res, 0, 
115 ), "Error output incorrect with no parameters." );
+
+        $this->removeTempDir();
+    }
 }
 ?>