Skip to content

Commit c6eeffc

Browse files
pfefferlepfefferle
committed
Update tests for namespaced REST controllers
1 parent b20ec7b commit c6eeffc

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

‎tests/test_endpoint-post-status.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
class Micropub_Endpoint_Post_Status_Test extends Micropub_UnitTestCase {
44
/**
5-
* An instance of the \Micropub\Endpoint class.
5+
* An instance of the \Micropub\Rest\Endpoint_Controller class.
66
*
7-
* @var \Micropub\Endpoint
7+
* @var \Micropub\Rest\Endpoint_Controller
88
*/
99
private $endpoint;
1010

1111
/**
1212
* An instance of the private post_status method from
13-
* the \Micropub\Endpoint class.
13+
* the \Micropub\Rest\Endpoint_Controller class.
1414
*/
1515
private $method;
1616

1717
public function set_up() {
18-
$this->endpoint = new \Micropub\Endpoint();
18+
$this->endpoint = new \Micropub\Rest\Endpoint_Controller();
1919

2020
// Perform magic to access the private method for testing.
21-
$ref = new ReflectionClass( '\Micropub\Endpoint' );
21+
$ref = new ReflectionClass( '\Micropub\Rest\Endpoint_Controller' );
2222
$this->method = $ref->getMethod( 'post_status' );
2323
$this->method->setAccessible( true );
2424
}

‎tests/test_endpoint.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
class Micropub_Endpoint_Test extends Micropub_UnitTestCase {
55

6+
protected static $route = '/' . MICROPUB_NAMESPACE . '/endpoint';
67

78
// POST args
89
protected static $post = array(
@@ -82,24 +83,25 @@ public function assertDateTimeZonesEqual( $expected, $actual ) {
8283

8384
public function test_register_routes() {
8485
$routes = rest_get_server()->get_routes();
85-
$this->assertArrayHasKey( \Micropub\Endpoint::get_route( true ), $routes, wp_json_encode( array_keys( $routes ) ) );
86-
$this->assertCount( 2, $routes[ \Micropub\Endpoint::get_route( true ) ] );
86+
$this->assertArrayHasKey( static::$route, $routes, wp_json_encode( array_keys( $routes ) ) );
87+
$this->assertCount( 2, $routes[ static::$route ] );
8788
}
8889

8990
public function test_parse_geo_uri() {
90-
$geo = \Micropub\Endpoint::parse_geo_uri( 'geo:42.361,-71.092,25000;u=25000' );
91+
$controller = new \Micropub\Rest\Endpoint_Controller();
92+
$geo = $controller->parse_geo_uri( 'geo:42.361,-71.092,25000;u=25000' );
9193
$this->assertEquals( $geo, static::$geo );
9294
}
9395

9496
public function create_form_request( $POST ) {
95-
$request = new WP_REST_Request( 'POST', \Micropub\Endpoint::get_route( true ) );
97+
$request = new WP_REST_Request( 'POST', static::$route );
9698
$request->set_header( 'Content-Type', 'application/x-www-form-urlencoded' );
9799
$request->set_body_params( $POST );
98100
return $request;
99101
}
100102

101103
public function create_json_request( $input ) {
102-
$request = new WP_REST_Request( 'POST', \Micropub\Endpoint::get_route( true ) );
104+
$request = new WP_REST_Request( 'POST', static::$route );
103105
$request->set_header( 'Content-Type', 'application/json' );
104106
$request->set_body( wp_json_encode( $input ) );
105107
return $request;
@@ -110,18 +112,19 @@ public function insert_post() {
110112
}
111113

112114
public function query_request( $GET ) {
113-
$request = new WP_REST_Request( 'GET', \Micropub\Endpoint::get_route( true ) );
115+
$request = new WP_REST_Request( 'GET', static::$route );
114116
$request->set_query_params( $GET );
115117
return $request;
116118
}
117119

118120
public function query_source( $post_id ) {
119-
$GET = array(
121+
$GET = array(
120122
'q' => 'source',
121123
'url' => 'http://example.org/?p=' . $post_id,
122124
);
123-
$request = self::query_request( $GET );
124-
$response = \Micropub\Endpoint::query_handler( $request );
125+
$request = self::query_request( $GET );
126+
$controller = new \Micropub\Rest\Endpoint_Controller();
127+
$response = $controller->query_handler( $request );
125128
return $response->get_data();
126129
}
127130

@@ -230,7 +233,8 @@ public function test_create_post_subscriber_id() {
230233
}
231234

232235
public function test_form_to_json_encode() {
233-
$output = \Micropub\Endpoint::form_to_json( static::$post );
236+
$controller = new \Micropub\Rest\Endpoint_Controller();
237+
$output = $controller->form_to_json( static::$post );
234238
$this->assertEquals( $output, static::$mf2 );
235239
}
236240

‎tests/test_media.php‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
class Micropub_Media_Test extends Micropub_UnitTestCase {
55

6+
protected static $route = '/' . MICROPUB_NAMESPACE . '/media';
7+
68
protected $test_file;
79
protected $test_file2;
810

@@ -18,12 +20,12 @@ public function set_up() {
1820

1921
public function test_register_routes() {
2022
$routes = rest_get_server()->get_routes();
21-
$this->assertArrayHasKey( \Micropub\Media::get_route( true ), $routes );
22-
$this->assertCount( 2, $routes[ \Micropub\Media::get_route( true ) ] );
23+
$this->assertArrayHasKey( static::$route, $routes );
24+
$this->assertCount( 2, $routes[ static::$route ] );
2325
}
2426

2527
public function upload_request() {
26-
$request = new WP_REST_Request( 'POST', \Micropub\Media::get_route( true ) );
28+
$request = new WP_REST_Request( 'POST', static::$route );
2729
$request->set_header( 'Content-Type', 'image/jpeg' );
2830
$request->set_file_params(
2931
array(
@@ -39,20 +41,20 @@ public function upload_request() {
3941
}
4042

4143
public function query_request( $GET ) {
42-
$request = new WP_REST_Request( 'GET', \Micropub\Media::get_route( true ) );
44+
$request = new WP_REST_Request( 'GET', static::$route );
4345
$request->set_query_params( $GET );
4446
return $request;
4547
}
4648

4749
public function create_form_request( $POST ) {
48-
$request = new WP_REST_Request( 'POST', \Micropub\Media::get_route( true ) );
50+
$request = new WP_REST_Request( 'POST', static::$route );
4951
$request->set_header( 'Content-Type', 'application/x-www-form-urlencoded' );
5052
$request->set_body_params( $POST );
5153
return $request;
5254
}
5355

5456
public function create_json_request( $input ) {
55-
$request = new WP_REST_Request( 'POST', \Micropub\Media::get_route( true ) );
57+
$request = new WP_REST_Request( 'POST', static::$route );
5658
$request->set_header( 'Content-Type', 'application/json' );
5759
$request->set_body( wp_json_encode( $input ) );
5860
return $request;
@@ -65,7 +67,8 @@ public function test_media_handle_upload() {
6567
'size' => filesize( $this->test_file ),
6668
'tmp_name' => $this->test_file,
6769
);
68-
$id = \Micropub\Media::media_handle_upload( $file_array );
70+
$controller = new \Micropub\Rest\Media_Controller();
71+
$id = $controller->media_handle_upload( $file_array );
6972
$this->assertIsInt( $id );
7073
$this->assertGreaterThanorEqual( 1, $id );
7174
}
@@ -126,7 +129,7 @@ public function test_unsupported_action() {
126129
}
127130

128131
public function test_empty_upload() {
129-
$request = new WP_REST_Request( 'POST', \Micropub\Media::get_route( true ) );
132+
$request = new WP_REST_Request( 'POST', static::$route );
130133
$response = $this->dispatch( $request, self::$author_id );
131134
$data = $response->get_data();
132135
$this->assertEquals( 400, $response->get_status(), wp_json_encode( $data ) );

0 commit comments

Comments
 (0)