Changeset 7047

Timestamp:

05/09/2013 02:11:52 PM (12 years ago)

Author:

boonebgorges

Message:

In test suite, factory->activity->create() should return an id, not an object

Two reasons: The value that's almost always needed is an ID, and it's more
consistent with WP's factories.

Location:

trunk/tests

Files:

• includes/factory.php (modified) (1 diff)
• testcases/activity/class.BP_Activity_Activity.php (modified) (6 diffs)
• testcases/activity/template.php (modified) (6 diffs)
• testcases/routing/activity.php (modified) (1 diff)

trunk/tests/includes/factory.php

@@ -31 +31 @@
             $args['user_id'] = get_current_user_id();
 
-        return $this->get_object_by_id( bp_activity_add( $args ) );
+        return bp_activity_add( $args );
     }
 

trunk/tests/testcases/activity/class.BP_Activity_Activity.php

@@ -26 +26 @@
 
         $result = BP_Activity_Activity::check_exists_by_content( $content );
-        $this->assertEquals( $activity->id, $result );
+        $this->assertEquals( $activity, $result );
     }
 
@@ -39 +39 @@
         ) );
 
-        BP_Activity_Activity::delete_activity_item_comments( $parent_activity->id );
+        BP_Activity_Activity::delete_activity_item_comments( $parent_activity );
 
         $result = BP_Activity_Activity::get( array( 'in' => wp_list_pluck( $comments, 'id' ), ) );
@@ -53 +53 @@
         ) );
 
-        bp_activity_update_meta( $activity->id, 'Paul', 'is cool' );
-        BP_Activity_Activity::delete_activity_meta_entries( $activity->id );
+        bp_activity_update_meta( $activity, 'Paul', 'is cool' );
+        BP_Activity_Activity::delete_activity_meta_entries( $activity );
 
-        $meta = bp_activity_get_meta( $activity->id, 'Paul' );
+        $meta = bp_activity_get_meta( $activity, 'Paul' );
         $this->assertFalse( $meta );
     }
@@ -68 +68 @@
 
         $activity = BP_Activity_Activity::get( array(
-            'in'          => $activity->id,
+            'in'          => $activity,
             'show_hidden' => true,
         ) );
@@ -77 +77 @@
         $a1 = $this->factory->activity->create();
         $a2 = $this->factory->activity->create();
-        bp_activity_update_meta( $a1->id, 'foo', 'bar' );
+        bp_activity_update_meta( $a1, 'foo', 'bar' );
 
         $activity = BP_Activity_Activity::get( array(
@@ -88 +88 @@
         ) );
         $ids = wp_list_pluck( $activity['activities'], 'id' );
-        $this->assertEquals( $ids, array( $a1->id ) );
+        $this->assertEquals( $ids, array( $a1 ) );
     }
 }

trunk/tests/testcases/activity/template.php

@@ -24 +24 @@
         global $bp;
 
-        $activity = $this->factory->activity->create( array(
+        $a = $this->factory->activity->create( array(
             'type' => 'activity_update',
         ) );
 
         // User can delete his own items
+        $activity = $this->factory->activity->get_object_by_id( $a );
         $this->assertTrue( bp_activity_user_can_delete( $activity ) );
 
@@ -75 +76 @@
         ) );
 
-        bp_activity_add_user_favorite( $a1->id, $user_id );
-        bp_activity_add_user_favorite( $a2->id, $user_id );
+        bp_activity_add_user_favorite( $a1, $user_id );
+        bp_activity_add_user_favorite( $a2, $user_id );
 
         // groan. It sucks that you have to invoke the global
@@ -92 +93 @@
         $ids = wp_list_pluck( $activities_template->activities, 'id' );
 
-        $this->assertEquals( $ids, array( $a1->id, $a2->id ) );
+        $this->assertEquals( $ids, array( $a1, $a2 ) );
 
         $activities_template = null;
@@ -107 +108 @@
         $ids = wp_list_pluck( $activities_template->activities, 'id' );
 
-        $this->assertEquals( $ids, array( $a1->id ) );
+        $this->assertEquals( $ids, array( $a1 ) );
 
         $activities_template = null;
@@ -118 +119 @@
         $a1 = $this->factory->activity->create();
         $a2 = $this->factory->activity->create();
-        bp_activity_update_meta( $a1->id, 'foo', 'bar' );
+        bp_activity_update_meta( $a1, 'foo', 'bar' );
 
         global $activities_template;
@@ -131 +132 @@
 
         $ids = wp_list_pluck( $activities_template->activities, 'id' );
-        $this->assertEquals( $ids, array( $a1->id ) );
+        $this->assertEquals( $ids, array( $a1 ) );
     }
 }

trunk/tests/testcases/routing/activity.php

@@ -28 +28 @@
      */
     function test_activity_permalink() {
-        $activity = $this->factory->activity->create();
+        $a = $this->factory->activity->create();
+        $activity = $this->factory->activity->get_object_by_id( $a );
 
         $url = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id . '/';