3 files changed, 62 insertions, 0 deletions
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 498dd756..e05fcbaa 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -127,6 +127,12 @@ class Gallery_Unit_Test_Controller extends Controller {
 
       $filter = count($_SERVER["argv"]) > 2 ? $_SERVER["argv"][2] : null;
       print new Unit_Test($modules, $filter);
+    } catch (ORM_Validation_Exception $e) {
+      print "Validation Exception: {$e->getMessage()}\n";
+      print $e->getTraceAsString() . "\n";
+      foreach ($e->validation->errors() as $field => $msg) {
+        print "$field: $msg\n";
+      }
     } catch (Exception $e) {
       print "Exception: {$e->getMessage()}\n";
       print $e->getTraceAsString() . "\n";
diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
new file mode 100644
index 00000000..5368539f
--- /dev/null
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -0,0 +1,50 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class test_Core {
+  static function random_album_unsaved($parent=null) {
+    $rand = rand();
+
+    $album = ORM::factory("item");
+    $album->type = "album";
+    $album->parent_id = $parent ? $parent->id : 1;
+    $album->name = "name_$rand";
+    $album->title = "title_$rand";
+    return $album;
+  }
+
+  static function random_album($parent=null) {
+    return test::random_album_unsaved($parent)->save();
+  }
+
+  static function random_photo_unsaved($parent=null) {
+    $rand = rand();
+    $photo = ORM::factory("item");
+    $photo->type = "photo";
+    $photo->parent_id = $parent ? $parent->id : 1;
+    $photo->set_data_file(MODPATH . "gallery/tests/test.jpg");
+    $photo->name = "name_$rand.jpg";
+    $photo->title = "title_$rand";
+    return $photo;
+  }
+
+  static function random_photo($parent=null) {
+    return test::random_photo_unsaved($parent)->save();
+  }
+}
diff --git a/modules/gallery_unit_test/views/kohana_unit_test_cli.php b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
index 3203ee44..a0de0f52 100644
--- a/modules/gallery_unit_test/views/kohana_unit_test_cli.php
+++ b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
@@ -57,6 +57,12 @@ foreach ($results as $class => $methods) {
         if ($result->getMessage()) {
           echo "  ", $result->getMessage(), "\n";
         }
+        if ($result instanceof ORM_Validation_Exception) {
+          echo "  Validation errors:\n";
+          foreach ($result->validation->errors() as $key => $value) {
+            echo "    $key: $value\n";
+          }
+        }
         echo "  ", $result->getFile(), " (Line ", $result->getLine(), ")\n";
         echo "\n";
         echo $result->getTraceAsString(), "\n";