Changeset 8131 for trunk/tests/testcases/activity/functions.php

Timestamp:

03/14/2014 12:37:28 AM (10 years ago)

Author:

boonebgorges

Message:

Return an empty string from get_meta() functions when no value is found

BP get_meta() functions have been inconsistent about the type of value returned
when no match is found for the object_id+meta_key combination. In some cases,
we followed WP's get_metadata() and returned an empty string. In others, we
returned false.

This changeset aligns all of our get_meta() functions with WP in this regard,
returning an empty string when no matching value is found. A boolean false is
still returned when invalid arguments are passed to the functions.

Relevant unit tests have been updated, including strict assertSame() checking
where appropriate.

See #5399

File:

• trunk/tests/testcases/activity/functions.php (modified) (9 diffs)

trunk/tests/testcases/activity/functions.php

@@ -133 +133 @@
         bp_activity_update_meta( $a, $krazy_key, 'bar' );
 
-        $this->assertEmpty( bp_activity_get_meta( $a, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     }
 
@@ -155 +155 @@
         $a = $this->factory->activity->create();
         bp_activity_update_meta( $a, 'foo', false );
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     }
 
@@ -164 +164 @@
     public function test_bp_activity_update_meta_new() {
         $a = $this->factory->activity->create();
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ), '"foo" meta should be empty for this activity item.' );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ), '"foo" meta should be empty for this activity item.' );
         $this->assertTrue( bp_activity_update_meta( $a, 'foo', 'bar' ) );
         $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) );
@@ -239 +239 @@
 
         $krazy_key = ' f!@#$%^o *(){}o?+';
-        $this->assertEmpty( bp_activity_get_meta( $a, $krazy_key ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, $krazy_key ) );
     }
 
@@ -270 +270 @@
      * @group bp_activity_get_meta
      * @group activitymeta
+     * @ticket BP5399
      */
     public function test_bp_activity_get_meta_no_results_returns_false() {
         $a = $this->factory->activity->create();
 
-        // @todo this is a quirk
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     }
 
@@ -347 +347 @@
         bp_activity_update_meta( $a, 'foo', 'bar' );
         $this->assertTrue( bp_activity_delete_meta( $a, 'foo', 'bar' ) );
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     }
 
@@ -359 +359 @@
         bp_activity_update_meta( $a, 'foo1', 'bar1' );
         $this->assertTrue( bp_activity_delete_meta( $a ) );
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo1' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo1' ) );
     }
 
@@ -371 +371 @@
         bp_activity_update_meta( $a, 'foo', 'bar' );
         $this->assertTrue( bp_activity_delete_meta( $a, 'foo', 'bar' ) );
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     }
 
@@ -409 +409 @@
 
         $this->assertTrue( bp_activity_delete_meta( $a1, 'foo', '', true ) );
-        $this->assertEmpty( '', bp_activity_get_meta( $a1, 'foo' ) );
-        $this->assertEmpty( '', bp_activity_get_meta( $a2, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a1, 'foo' ) );
+        $this->assertSame( '', bp_activity_get_meta( $a2, 'foo' ) );
         $this->assertSame( 'bar1', bp_activity_get_meta( $a1, 'foo1' ) );
         $this->assertSame( 'bar1', bp_activity_get_meta( $a2, 'foo1' ) );