During the Write of Passage, I stubbornly tried to beat my writer’s block by writing until 3am multiple times. The burnout returned. I dropped everything and went to Greece for a week.
+During the Write of Passage, I stubbornly tried to beat my writer’s block by writing until 3am multiple times. The burnout returned. I dropped everything and went to Greece for a week.
diff --git a/transfer-protocol/phpunit.xml b/transfer-protocol/phpunit.xml index b2ea419..b5c1af0 100644 --- a/transfer-protocol/phpunit.xml +++ b/transfer-protocol/phpunit.xml @@ -1,11 +1,10 @@ -
';
$p = new WP_Block_Markup_Url_Processor( $markup );
$this->assertTrue( $p->next_url(), 'Failed to find the URL in the markup.' );
- $this->assertEquals( 'https://first-url.org', $p->get_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
+ $this->assertEquals( 'https://first-url.org', $p->get_raw_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
$this->assertTrue( $p->next_url(), 'Failed to find the URL in the markup.' );
- $this->assertEquals( 'https://mysite.com/wp-content/image.png', $p->get_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
+ $this->assertEquals( 'https://mysite.com/wp-content/image.png', $p->get_raw_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
}
public function test_next_url_finds_urls_in_multiple_tags( ) {
$markup = '';
$p = new WP_Block_Markup_Url_Processor( $markup );
$this->assertTrue( $p->next_url(), 'Failed to find the URL in the markup.' );
- $this->assertEquals( 'https://first-url.org', $p->get_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
+ $this->assertEquals( 'https://first-url.org', $p->get_raw_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
$this->assertTrue( $p->next_url(), 'Failed to find the URL in the markup.' );
- $this->assertEquals( 'https://mysite.com/wp-content/image.png', $p->get_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
+ $this->assertEquals( 'https://mysite.com/wp-content/image.png', $p->get_raw_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
$this->assertTrue( $p->next_url(), 'Failed to find the URL in the markup.' );
- $this->assertEquals( 'https://third-url.org', $p->get_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
+ $this->assertEquals( 'https://third-url.org', $p->get_raw_url(), 'Found a URL in the markup, but it wasn\'t the expected one.' );
}
/**
@@ -114,7 +114,7 @@ public function test_set_url($markup, $new_url, $new_markup)
{
$p = new WP_Block_Markup_Url_Processor($markup);
$this->assertTrue($p->next_url(), 'Failed to find the URL in the markup.');
- $this->assertTrue($p->set_url($new_url), 'Failed to set the URL in the markup.');
+ $this->assertTrue($p->set_raw_url($new_url), 'Failed to set the URL in the markup.');
$this->assertEquals($new_markup, $p->get_updated_html(), 'Failed to set the URL in the markup.');
}
@@ -163,7 +163,7 @@ public function test_set_url_complex_test_case()
// Replace every url with 'https://site-export.internal'
while($p->next_url()) {
- $p->set_url('https://site-export.internal');
+ $p->set_raw_url('https://site-export.internal');
}
$this->assertEquals(
@@ -178,8 +178,8 @@ public function test_set_url_complex_test_case()
-Have you seen my blog, https://site-export.internal? I told a story there of how I got my Bachelor's degree, -check it out: https://site-export.internal +Have you seen my blog, site-export.internal? I told a story there of how I got my Bachelor's degree, +check it out: site-export.internal
HTML, diff --git a/transfer-protocol/tests/WPMigrationURLInTextProcessorTests.php b/transfer-protocol/tests/WPMigrationURLInTextProcessorTests.php new file mode 100644 index 0000000..fbfb5d1 --- /dev/null +++ b/transfer-protocol/tests/WPMigrationURLInTextProcessorTests.php @@ -0,0 +1,163 @@ +assertTrue( $p->next_url(), 'Failed to find the URL in the text.' ); + } + $this->assertEquals( $url, $p->get_raw_url(), 'Found a URL in the text, but it wasn\'t the expected one.' ); + $this->assertEquals( $parsed_href, $p->get_parsed_url()->href, 'Found a URL in the text, but it wasn\'t the expected one.' ); + } + + static public function provider_test_finds_next_url_when_base_url_is_used() { + return [ + 'Absolute URL (first)' => [ + 'https://wordpress.org', + 'https://wordpress.org/', + 'Have you seen https://wordpress.org?', + ], + 'Absolute URL (second) ' => [ + 'https://w.org', + 'https://w.org/', + 'Have you seen https://wordpress.org or https://w.org?', + 2, + ], + 'Absolute URL with an all-ASCII path' => [ + 'https://w.org/plugins', + 'https://w.org/plugins', + 'Visit the WordPress plugins directory https://w.org/plugins', + ], + 'Absolute URL with a UTF-8 query' => [ + 'https://w.org/plugins?łąka=1', + 'https://w.org/plugins?%C5%82%C4%85ka=1', + 'Visit the WordPress plugins directory https://w.org/plugins?łąka=1', + ], + 'Absolute URL with a urlencoded all-ASCII query' => [ + 'https://w.org/plugins?%C5%82%C4%85ka=1', + 'https://w.org/plugins?%C5%82%C4%85ka=1', + 'Visit the WordPress plugins directory https://w.org/plugins?%C5%82%C4%85ka=1', + ], + 'Protocol-relative URL' => [ '//w.org/', 'https://w.org/', 'Visit the WordPress org at //w.org/ ' ], + 'UTF-8 characters in the path' => [ + 'https://w.org/łąka', + 'https://w.org/%C5%82%C4%85ka', + 'Visit the WordPress plugins directory https://w.org/łąka', + ], + 'Domain-only' => [ 'www.example.com', 'https://www.example.com/', 'Visit www.example.com' ], + 'Domain + path' => [ + 'www.example.com/path', + 'https://www.example.com/path', + 'Visit www.example.com/path', + ], + 'UTF-8 domain' => [ 'łąka.pl', 'https://xn--ka-ola7v.pl/', 'Więcej na łąka.pl' ], + 'Skips the closing parenthesis after the path' => [ + 'https://w.org/plugins', + 'https://w.org/plugins', + 'Visit the WordPress plugins directory (https://w.org/plugins)', + ], + 'Retains the parenthesis within the path' => [ + 'https://w.org/plug(in)s', + 'https://w.org/plug(in)s', + 'Visit the WordPress plugins directory (https://w.org/plug(in)s', + ], + 'Skips index.html' => [ + 'www.example.com', + 'https://www.example.com/', + 'Visit index.html www.example.com', + ], + ]; + } + + public function test_set_url_returns_true_on_success() { + $p = new WP_Migration_URL_In_Text_Processor( 'Have you seen https://wordpress.org?' ); + $p->next_url(); + $this->assertTrue( $p->set_raw_url( 'https://w.org' ), 'Failed to set the URL in the text.' ); + } + + public function test_set_url_returns_false_on_failure() { + $p = new WP_Migration_URL_In_Text_Processor( 'Have you seen WordPress?' ); + $p->next_url(); + $this->assertFalse( $p->set_raw_url( 'https://w.org' ), 'set_url returned true when no URL was matched.' ); + } + + /** + * + * @dataProvider provider_test_set_url_data + */ + public function test_set_url_replaces_the_url( $text, $new_url, $expected_text ) { + $p = new WP_Migration_URL_In_Text_Processor( $text ); + $p->next_url(); + $p->set_raw_url( $new_url ); + $this->assertEquals( + $new_url, + $p->get_raw_url(), + 'Failed to set the URL in the text.' + ); + $this->assertEquals( + $expected_text, + $p->get_updated_text(), + 'Failed to set the URL in the text.' + ); + } + + static public function provider_test_set_url_data() { + return [ + 'Replace with HTTPS URL' => [ + 'Have you seen https://wordpress.org (or wp.org)?', + 'https://wikipedia.org', + 'Have you seen https://wikipedia.org (or wp.org)?', + ], + 'Replace with a protocol-relative URL' => [ + 'Have you seen https://wordpress.org (or wp.org)?', + '//wikipedia.org', + 'Have you seen //wikipedia.org (or wp.org)?', + ], + 'Replace with a schema-less URL' => [ + 'Have you seen https://wordpress.org (or wp.org)?', + 'wikipedia.org', + 'Have you seen wikipedia.org (or wp.org)?', + ], + ]; + } + + public function test_set_url_can_be_called_twice() { + $p = new WP_Migration_URL_In_Text_Processor( 'Have you seen https://wordpress.org (or w.org)?' ); + $p->next_url(); + $p->set_raw_url( 'https://developer.wordpress.org' ); + $p->get_updated_text(); + $p->set_raw_url( 'https://wikipedia.org' ); + $this->assertEquals( + 'https://wikipedia.org', + $p->get_raw_url(), + 'Failed to set the URL in the text.' + ); + $this->assertEquals( + 'Have you seen https://wikipedia.org (or w.org)?', + $p->get_updated_text(), + 'Failed to set the URL in the text.' + ); + } + + public function test_set_url_can_be_called_twice_before_moving_on() { + $p = new WP_Migration_URL_In_Text_Processor( 'Have you seen https://wordpress.org (or w.org)?', 'https://w.org' ); + $p->next_url(); + $p->set_raw_url( 'https://wikipedia.org' ); + $p->get_updated_text(); + $p->set_raw_url( 'https://developer.wordpress.org' ); + $p->next_url(); + $p->set_raw_url( 'https://meetups.wordpress.org' ); + $this->assertEquals( + 'Have you seen https://developer.wordpress.org (or meetups.wordpress.org)?', + $p->get_updated_text(), + 'Failed to set the URL in the text.' + ); + } +} diff --git a/transfer-protocol/tests/WP_Migration_URL_In_Text_Processor_Tests.php b/transfer-protocol/tests/WP_Migration_URL_In_Text_Processor_Tests.php deleted file mode 100644 index 601156c..0000000 --- a/transfer-protocol/tests/WP_Migration_URL_In_Text_Processor_Tests.php +++ /dev/null @@ -1,124 +0,0 @@ -assertTrue($p->next_url(), 'Failed to find the URL in the text.'); - } - $this->assertEquals($url, $p->get_url(), 'Found a URL in the text, but it wasn\'t the expected one.'); - } - - static public function provider_test_finds_next_url() - { - return [ - 'Absolute URL' => ['https://wordpress.org', 'Have you seen https://wordpress.org?'], - 'Second absolute URL' => ['https://w.org', 'Have you seen https://wordpress.org or https://w.org?', 1], - 'Domain-only' => ['www.example.com', 'Visit www.example.com'], - 'Domain + path' => ['www.example.com/path', 'Visit www.example.com/path'], - 'UTF-8 domain' => ['łąka.pl', 'Więcej na łąka.pl'], - 'ASCII path' => ['https://w.org/plugins', 'Visit the WordPress plugins directory https://w.org/plugins'], - 'Urlencoded query' => ['https://w.org/plugins?%C5%82%C4%85ka=1', 'Visit the WordPress plugins directory https://w.org/plugins?%C5%82%C4%85ka=1'], - 'UTF-8 characters in the query' => ['https://w.org/plugins?łąka=1', 'Visit the WordPress plugins directory https://w.org/plugins?łąka=1'], - 'UTF-8 characters in the path' => ['https://w.org/łąka', 'Visit the WordPress plugins directory https://w.org/łąka'], - 'Closing parenthesis after the path' => ['https://w.org/plugins', 'Visit the WordPress plugins directory (https://w.org/plugins)'], - 'Parenthesis within the path' => ['https://w.org/plug(in)s', 'Visit the WordPress plugins directory (https://w.org/plug(in)s'], - 'Protocol-relative URL' => ['//w.org/', 'Visit the WordPress org at //w.org/ '], - ]; - } - - public function test_set_url_returns_true_on_success() { - $p = new WP_Migration_URL_In_Text_Processor('Have you seen https://wordpress.org?'); - $p->next_url(); - $this->assertTrue($p->set_url('https://w.org'), 'Failed to set the URL in the text.'); - } - - public function test_set_url_returns_false_on_failure() { - $p = new WP_Migration_URL_In_Text_Processor('Have you seen WordPress?'); - $p->next_url(); - $this->assertFalse($p->set_url('https://w.org'), 'set_url returned true when no URL was matched.'); - } - - /** - * - * @dataProvider provider_test_set_url_data - */ - public function test_set_url_replaces_the_url( $text, $new_url, $expected_text ) { - $p = new WP_Migration_URL_In_Text_Processor($text); - $p->next_url(); - $p->set_url($new_url); - $this->assertEquals( - $new_url, - $p->get_url(), - 'Failed to set the URL in the text.' - ); - $this->assertEquals( - $expected_text, - $p->get_updated_text(), - 'Failed to set the URL in the text.' - ); - } - - static public function provider_test_set_url_data() - { - return [ - 'Replace with HTTPS URL' => [ - 'Have you seen https://wordpress.org (or wp.org)?', - 'https://wikipedia.org', - 'Have you seen https://wikipedia.org (or wp.org)?', - ], - 'Replace with a protocol-relative URL' => [ - 'Have you seen https://wordpress.org (or wp.org)?', - '//wikipedia.org', - 'Have you seen //wikipedia.org (or wp.org)?', - ], - 'Replace with a schema-less URL' => [ - 'Have you seen https://wordpress.org (or wp.org)?', - 'wikipedia.org', - 'Have you seen wikipedia.org (or wp.org)?', - ], - ]; - } - - public function test_set_url_can_be_called_twice( ) { - $p = new WP_Migration_URL_In_Text_Processor('Have you seen https://wordpress.org (or w.org)?'); - $p->next_url(); - $p->set_url('https://developer.wordpress.org'); - $p->get_updated_text(); - $p->set_url('https://wikipedia.org'); - $this->assertEquals( - 'https://wikipedia.org', - $p->get_url(), - 'Failed to set the URL in the text.' - ); - $this->assertEquals( - 'Have you seen https://wikipedia.org (or w.org)?', - $p->get_updated_text(), - 'Failed to set the URL in the text.' - ); - } - - public function test_set_url_can_be_called_twice_before_moving_on( ) { - $p = new WP_Migration_URL_In_Text_Processor('Have you seen https://wordpress.org (or w.org)?'); - $p->next_url(); - $p->set_url('https://wikipedia.org'); - $p->get_updated_text(); - $p->set_url('https://developer.wordpress.org'); - $p->next_url(); - $p->set_url('https://meetups.wordpress.org'); - $this->assertEquals( - 'Have you seen https://developer.wordpress.org (or https://meetups.wordpress.org)?', - $p->get_updated_text(), - 'Failed to set the URL in the text.' - ); - } -} diff --git a/transfer-protocol/tests/urltestdata.json b/transfer-protocol/tests/whatwg_url_test_data.json similarity index 100% rename from transfer-protocol/tests/urltestdata.json rename to transfer-protocol/tests/whatwg_url_test_data.json