Skip to content

Commit

Permalink
Added an Arr::merge test for #2945
Browse files Browse the repository at this point in the history
  • Loading branch information
Woody Gilk committed Jun 26, 2010
1 parent 7a78686 commit db35973
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions tests/kohana/ArrTest.php
Expand Up @@ -169,7 +169,17 @@ function provider_merge()
array('name' => 'john', 'children' => array('fred', 'paul', 'sally', 'jane')),
array('name' => 'mary', 'children' => array('jane')),
),
);
array(
array('digits' => array(0, 1, 2, 3)),
array('digits' => array(0, 1)),
array('digits' => array(2, 3)),
),
array(
array(0, 1, 2, 3),
array(0, 1),
array(2, 3),
),
);
}

/**
Expand Down Expand Up @@ -241,7 +251,7 @@ function test_path($expected, $array, $path, $default = NULL)

/**
* Provides test data for test_range()
*
*
* @return array
*/
function provider_range()
Expand All @@ -252,7 +262,7 @@ function provider_range()
array(25, 10),
);
}

/**
* Tests Arr::range()
*
Expand Down Expand Up @@ -338,7 +348,7 @@ function provider_overwrite()
function test_overwrite($expected, $arr1, $arr2, $arr3 = array(), $arr4 = array())
{
$this->assertSame(
$expected,
$expected,
Arr::overwrite($arr1, $arr2, $arr3, $arr4)
);
}
Expand Down

0 comments on commit db35973

Please sign in to comment.