Fix failing tests and add a new test for object printing.

Author: markstory

Test/Case/View/Helper/HtmlToolbarHelperTest.php

@@ -165,6 +165,7 @@ public function testMakeNeatArray() {
 			'ul' => array('class' => 'neat-array depth-0'),
 			'<li', '<strong', 'key', '/strong', 'value', '/li',
 			'<li', '<strong', 'foo', '/strong',
+				'(array)',
 				array('ul' => array('class' => 'neat-array depth-1')),
 				'<li', '<strong', 'this', '/strong', 'deep', '/li',
 				'<li', '<strong', 'another', '/strong', 'value', '/li',
@@ -190,12 +191,14 @@ public function testMakeNeatArray() {
 			'ul' => array('class' => 'neat-array depth-0 expanded'),
 			'<li', '<strong', 'key', '/strong', 'value', '/li',
 			'<li', '<strong', 'foo', '/strong',
+				'(array)',
 				array('ul' => array('class' => 'neat-array depth-1')),
 				'<li', '<strong', 'this', '/strong', 'deep', '/li',
 				'<li', '<strong', 'another', '/strong', 'value', '/li',
 				'/ul',
 			'/li',
 			'<li', '<strong', 'lotr', '/strong',
+				'(array)',
 				array('ul' => array('class' => 'neat-array depth-1')),
 				'<li', '<strong', 'gandalf', '/strong', 'wizard', '/li',
 				'<li', '<strong', 'bilbo', '/strong', 'hobbit', '/li',
@@ -210,12 +213,14 @@ public function testMakeNeatArray() {
 			'ul' => array('class' => 'neat-array depth-0 expanded'),
 			'<li', '<strong', 'key', '/strong', 'value', '/li',
 			'<li', '<strong', 'foo', '/strong',
+				'(array)',
 				array('ul' => array('class' => 'neat-array depth-1 expanded')),
 				'<li', '<strong', 'this', '/strong', 'deep', '/li',
 				'<li', '<strong', 'another', '/strong', 'value', '/li',
 				'/ul',
 			'/li',
 			'<li', '<strong', 'lotr', '/strong',
+				'(array)',
 				array('ul' => array('class' => 'neat-array depth-1 expanded')),
 				'<li', '<strong', 'gandalf', '/strong', 'wizard', '/li',
 				'<li', '<strong', 'bilbo', '/strong', 'hobbit', '/li',
@@ -236,6 +241,32 @@ public function testMakeNeatArray() {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test makeNeatArray with object inputs.
+ *
+ * @return void
+ */
+	public function testMakeNeatArrayObjects() {
+		$in = new StdClass();
+		$in->key = 'value';
+		$in->nested = new StdClass();
+		$in->nested->name = 'mark';
+
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			array('ul' => array('class' => 'neat-array depth-0')),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'<li', '<strong', 'nested', '/strong',
+			'(object)',
+			array('ul' => array('class' => 'neat-array depth-1')),
+			'<li', '<strong', 'name', '/strong', 'mark', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Test injection of toolbar
  *