Simplification of 59b04b897b8a664cd7334b017fac8158a6281434 for #1764:

- Breadcrumb::build_from_item becomes Breadcrumb::array_from_item_parents
- Eliminate Breadcrumb::$id -- it's no longer necessary
- Fold Breadcrumb::generate_show_query_strings into Breadcrumb::array_from_item_parents
- Create Breadcrumb::set_first() and Breadcrumb::set_last()
- Breadcrumb::build_from_list goes away, we just use arrays for this
- Change Search_Controller and Tag_Controller to just create an array
  of Breadcrumb instances with the first/last marked appropriately
- Breadcrumb_Test loses a bunch of complexity.

1 files changed, 9 insertions, 24 deletions

diff --git a/modules/gallery/tests/Breadcrumb_Test.php b/modules/gallery/tests/Breadcrumb_Test.php
index 9f9aeddc..ed2e5608 100644
--- a/modules/gallery/tests/Breadcrumb_Test.php
+++ b/modules/gallery/tests/Breadcrumb_Test.php
@@ -21,31 +21,16 @@ class Breadcrumb_Test extends Gallery_Unit_Test_Case {
   private $album;
   private $item;
 
-  public function setup() {
-    $this->album = test::random_album();
-    $this->item = test::random_photo($this->album);
-    $this->album->reload();
-  }
-
-  public function teardown() {
-    $this->album = null;
-    $this->item = null;
-  }
-
   public function build_breadcrumbs_for_item_test() {
-    $breadcrumbs = Breadcrumb::build_from_item($this->item);
-    $this->assert_equal("Gallery", $breadcrumbs[0]->title);
-    $this->assert_equal($this->album->title, $breadcrumbs[1]->title);
-    $this->assert_equal($this->item->title, $breadcrumbs[2]->title);
-  }
+    $album = test::random_album();
+    $item = test::random_photo($album);
 
-  public function build_breadcrumbs_from_items_test() {
-    $breadcrumbs = Breadcrumb::build_from_list(
-      new Breadcrumb(item::root()->title, "/", item::root()->id),
-      new Breadcrumb($this->album->title, $this->album->relative_path(), $this->album->id),
-      new Breadcrumb($this->item->title, $this->item->relative_path(), $this->item->id));
-    $this->assert_equal("Gallery", $breadcrumbs[0]->title);
-    $this->assert_equal($this->album->title, $breadcrumbs[1]->title);
-    $this->assert_equal($this->item->title, $breadcrumbs[2]->title);
+    $expected = array();
+    $expected[] = Breadcrumb::instance(
+      item::root()->title, item::root()->url("show={$album->id}"))->set_first();
+    $expected[] =
+      Breadcrumb::instance($album->title, $album->url("show={$item->id}"));
+    $expected[] = Breadcrumb::instance($item->title, $item->url())->set_last();
+    $this->assert_equal($expected, Breadcrumb::array_from_item_parents($item));
   }
 }
\ No newline at end of file