Removes code duplication between value_or_default() function and its …

…v() alias; adding some tests [#9 state:resolved]
sofadesign · Jul 1, 2009 · 9c48e03 · 9c48e03
1 parent 88838d1
commit 9c48e03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/limonade.php b/lib/limonade.php
@@ -1434,7 +1434,7 @@ function value_or_default($value, $default)
  */
 function v($value, $default)
 {
-  return empty($value) ? $default : $value;
+  return call_user_func('value_or_default', $value, $default);
 }
 
 /**

diff --git a/tests/main.php b/tests/main.php
@@ -134,7 +134,13 @@ function test_main_require_once_dir()
 
    function test_main_value_or_default()
    {
-     # TODO test value_or_default
+     assert_equal(value_or_default(10, 20), 10);
+     assert_equal(value_or_default(0, 20), 20);
+     assert_equal(value_or_default(null, 20), 20);
+     assert_equal(value_or_default('hello', 'world'), 'hello');
+     assert_equal(value_or_default('', 'world'), 'world');
+     assert_equal(value_or_default(10, 20), v(10, 20));
+     assert_equal(value_or_default(0, 20), v(0, 20));
    }
 
    function test_main_file_path()