Update tests to use plugin folder structure (#1049)

* Update tests to use plugin folder structure

* Remove unused imports

* Update latest test file

* Bring back error silencer.

* Move test file in correct folder

Author: obenland

phpunit.xml.dist

@@ -8,7 +8,7 @@
 	>
 	<testsuites>
 		<testsuite name="ActivityPub">
-			<directory prefix="class-test-" suffix=".php">./tests/</directory>
+			<directory prefix="class-test-" suffix=".php">./tests</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>

tests/class-activitypub-testcase-cache-http.php

@@ -5,6 +5,8 @@
  * @package Activitypub
  */
 
+namespace Activitypub\Tests;
+
 /**
  * Test class for Activitypub Cache HTTP.
  */
@@ -59,7 +61,7 @@ public function tear_down() {
 	 *      @type string $body   Request body.
 	 * }
 	 * @param string $url The request URL.
-	 * @return array|bool|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance. A boolean false value.
+	 * @return array|bool|\WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance. A boolean false value.
 	 */
 	public static function pre_http_request( $preempt, $request, $url ) {
 		$p     = wp_parse_url( $url );

tests/class-test-activitypub-post.php

@@ -1,18 +1,21 @@
 <?php
 /**
- * Test file for Activitypub Activity.
+ * Test file for Activity.
  *
  * @package Activitypub
  */
 
+namespace Activitypub\Tests\Activity;
+
+use Activitypub\Activity\Activity;
 use DMS\PHPUnitExtensions\ArraySubset\Assert;
 
 /**
- * Test class for Activitypub Activity.
+ * Test class for Activity.
  *
  * @coversDefaultClass \Activitypub\Activity\Activity
  */
-class Test_Activitypub_Activity extends WP_UnitTestCase {
+class Test_Activity extends \WP_UnitTestCase {
 
 	/**
 	 * Test activity mentions.
@@ -35,7 +38,7 @@ function ( $mentions ) {
 
 		$activitypub_post = \Activitypub\Transformer\Post::transform( get_post( $post ) )->to_object();
 
-		$activitypub_activity = new \Activitypub\Activity\Activity();
+		$activitypub_activity = new Activity();
 		$activitypub_activity->set_type( 'Create' );
 		$activitypub_activity->set_object( $activitypub_post );
 
@@ -81,7 +84,7 @@ public function test_activity_object() {
 			),
 		);
 
-		$activity = \Activitypub\Activity\Activity::init_from_array( $test_array );
+		$activity = Activity::init_from_array( $test_array );
 
 		$this->assertEquals( 'Hello world!', $activity->get_object()->get_content() );
 		Assert::assertArraySubset( $test_array, $activity->to_array() );
@@ -94,7 +97,7 @@ public function test_activity_object_url() {
 		$id = 'https://example.com/author/123';
 
 		// Build the update.
-		$activity = new \Activitypub\Activity\Activity();
+		$activity = new Activity();
 		$activity->set_type( 'Update' );
 		$activity->set_actor( $id );
 		$activity->set_object( $id );

tests/class-test-activitypub-activity.php …ncludes/activity/class-test-activity.phptests/class-test-activitypub-activity.php renamed to tests/includes/activity/class-test-activity.php tests/class-test-activitypub-activity.php renamed to tests/includes/activity/class-test-activity.php

@@ -5,12 +5,16 @@
  * @package Activitypub
  */
 
+namespace Activitypub\Tests;
+
+use Activitypub\Activity_Dispatcher;
+
 /**
  * Test class for Activitypub Activity Dispatcher.
  *
  * @coversDefaultClass \Activitypub\Activity_Dispatcher
  */
-class Test_Activitypub_Activity_Dispatcher extends ActivityPub_TestCase_Cache_HTTP {
+class Test_Activity_Dispatcher extends ActivityPub_TestCase_Cache_HTTP {
 
 	/**
 	 * Users.
@@ -70,10 +74,10 @@ public function test_dispatch_activity() {
 			)
 		);
 
-		$pre_http_request = new MockAction();
+		$pre_http_request = new \MockAction();
 		add_filter( 'pre_http_request', array( $pre_http_request, 'filter' ), 10, 3 );
 
-		\Activitypub\Activity_Dispatcher::send_activity( get_post( $post ), 'Create' );
+		Activity_Dispatcher::send_activity( get_post( $post ), 'Create' );
 
 		$this->assertSame( 2, $pre_http_request->get_call_count() );
 		$all_args        = $pre_http_request->get_args();
@@ -120,10 +124,10 @@ function ( $mentions ) {
 			}
 		);
 
-		$pre_http_request = new MockAction();
+		$pre_http_request = new \MockAction();
 		add_filter( 'pre_http_request', array( $pre_http_request, 'filter' ), 10, 3 );
 
-		\Activitypub\Activity_Dispatcher::send_activity( get_post( $post ), 'Create' );
+		Activity_Dispatcher::send_activity( get_post( $post ), 'Create' );
 
 		$this->assertSame( 1, $pre_http_request->get_call_count() );
 		$all_args        = $pre_http_request->get_args();
@@ -158,10 +162,10 @@ public function test_dispatch_announce() {
 			)
 		);
 
-		$pre_http_request = new MockAction();
+		$pre_http_request = new \MockAction();
 		add_filter( 'pre_http_request', array( $pre_http_request, 'filter' ), 10, 3 );
 
-		\Activitypub\Activity_Dispatcher::send_activity_or_announce( get_post( $post ), 'Create' );
+		Activity_Dispatcher::send_activity_or_announce( get_post( $post ), 'Create' );
 
 		$all_args        = $pre_http_request->get_args();
 		$first_call_args = $all_args[0];
@@ -211,10 +215,10 @@ function ( $value, $type ) {
 			)
 		);
 
-		$pre_http_request = new MockAction();
+		$pre_http_request = new \MockAction();
 		add_filter( 'pre_http_request', array( $pre_http_request, 'filter' ), 10, 3 );
 
-		\Activitypub\Activity_Dispatcher::send_activity_or_announce( get_post( $post ), 'Create' );
+		Activity_Dispatcher::send_activity_or_announce( get_post( $post ), 'Create' );
 
 		$all_args        = $pre_http_request->get_args();
 		$first_call_args = $all_args[0];
@@ -268,10 +272,10 @@ function ( $disabled, $user_id ) {
 			)
 		);
 
-		$pre_http_request = new MockAction();
+		$pre_http_request = new \MockAction();
 		add_filter( 'pre_http_request', array( $pre_http_request, 'filter' ), 10, 3 );
 
-		\Activitypub\Activity_Dispatcher::send_activity( get_post( $post ), 'Create' );
+		Activity_Dispatcher::send_activity( get_post( $post ), 'Create' );
 
 		$all_args        = $pre_http_request->get_args();
 		$first_call_args = $all_args[0];

…test-activitypub-activity-dispatcher.php …ludes/class-test-activity-dispatcher.phptests/class-test-activitypub-activity-dispatcher.php renamed to tests/includes/class-test-activity-dispatcher.php tests/class-test-activitypub-activity-dispatcher.php renamed to tests/includes/class-test-activity-dispatcher.php

@@ -5,12 +5,14 @@
  * @package Activitypub
  */
 
+namespace Activitypub\Tests;
+
 /**
  * Test class for Activitypub.
  *
  * @coversDefaultClass \Activitypub\Activitypub
  */
-class Test_Activitypub extends WP_UnitTestCase {
+class Test_Activitypub extends \WP_UnitTestCase {
 
 	/**
 	 * Test post type support.

tests/class-test-activitypub.php tests/includes/class-test-activitypub.phptests/class-test-activitypub.php renamed to tests/includes/class-test-activitypub.php

@@ -5,12 +5,14 @@
  * @package Activitypub
  */
 
+namespace Activitypub\Tests;
+
 /**
  * Test class for Admin.
  *
  * @coversDefaultClass \Activitypub\Admin
  */
-class Test_Admin extends WP_UnitTestCase {
+class Test_Admin extends \WP_UnitTestCase {
 
 	/**
 	 * Test the admin notice for missing permalink structure.