Changeset 5497 for sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

Timestamp:

05/17/2017 08:30:29 PM (9 years ago)

Author:

iandunn

Message:

Events: Remove get_city_from_coordinates() to improve performance

The function was not performant, and it's not easy to make it that way. It's only needed for a few edge cases, and we can get the location from the events themselves (similar to r5491). So, removing this is a good trade-off.

Because we are able to rebuild the location, no changes are needed in Core, and a new version of this endpoint is not needed.

See #2823
Props dd32

File:

• sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php (modified) (4 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -19 +19 @@
         $tests_failed = 0;
         $tests_failed += test_get_location();
-        $tests_failed += test_get_city_from_coordinates();
         $query_count  = count( $wpdb->queries );
         $query_time   = array_sum( array_column( $wpdb->queries, 1 ) );
@@ -698 +697 @@
                         ),
                         'expected' => array(
-                                'description' => 'seattle',
+                                'description' => false,
                                 'latitude'    => '47.606',
                                 'longitude'   => '-122.332',
@@ -713 +712 @@
                         ),
                         'expected' => array(
-                                'description' => 'otavi',
+                                'description' => false,
                                 'latitude'    => '-19.634',
                                 'longitude'   => '17.332',
@@ -792 +791 @@
 }
 
-/**
- * Test `get_city_from_coordinates()`
- *
- * @todo This can probably be refactored along with test_get_location() into a more abstract/DRY general-purpose
- *       test runner.
- *
- * @return bool The number of failures
- */
-function test_get_city_from_coordinates() {
-        $failed = 0;
-        $cases  = get_city_from_coordinates_test_cases();
-
-        printf( "\n\nRunning %d city from coordinate tests\n", count( $cases ) );
-
-        foreach ( $cases as $case_id => $case ) {
-                $case['input'] = add_cachebusting_parameter( $case['input'] );
-                $actual_result = get_city_from_coordinates( $case['input']['latitude'], $case['input']['longitude'] );
-                $passed        = $case['expected'] === $actual_result;
-
-                output_results( $case_id, $passed, $case['expected'], $actual_result );
-
-                if ( ! $passed ) {
-                        $failed++;
-                }
-        }
-
-        return $failed;
-}
-
-/**
- * Get the cases for testing `get_city_from_coordinates()`
- *
- * @return array
- */
-function get_city_from_coordinates_test_cases() {
-         $cases = array(
-                'lower-latitude-higher-longitude' => array(
-                        'input' => array(
-                                'latitude'  => '60.199',
-                                'longitude' => '24.660'
-                        ),
-                        'expected' => 'Espoo',
-                ),
-
-                'higher-latitude-lower-longitude' => array(
-                        'input' => array(
-                                'latitude'  => '22.000',
-                                'longitude' => '95.900'
-                        ),
-                        'expected' => 'Mandalay',
-                ),
-
-                'middle-of-no-and-where' => array(
-                        'input' => array(
-                                'latitude'  => '-23.121',
-                                'longitude' => '125.071'
-                        ),
-                        'expected' => false,
-                ),
-        );
-
-        return $cases;
-}
-
 run_tests();