<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57146] trunk/tests/phpunit/tests/functions: Tests: Update `_wp_timezone_choice_usort_callback()` tests for consistency.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57146">57146</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57146","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-11-30 11:15:34 +0000 (Thu, 30 Nov 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Update `_wp_timezone_choice_usort_callback()` tests for consistency.
* Use the same `@group` annotation as the other tests.
* Use `assertSame()` to verify the type of the result.
* Use `data_` prefix for the data provider.
* Use named data set in the data provider. This makes the output when using the `--testdox` option more descriptive and is helpful when trying to debug which data set from a data provider failed the test.
* Other minor corrections.
Reference: [https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#repetitive-tests Core Handbook: Writing PHP Tests: Repetitive Tests].
Follow-up to <a href="https://core.trac.wordpress.org/changeset/57145">[57145]</a>.
See <a href="https://core.trac.wordpress.org/ticket/59953">#59953</a>, <a href="https://core.trac.wordpress.org/ticket/59647">#59647</a>.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionswpTimezoneChoiceUsortCallbackphp">trunk/tests/phpunit/tests/functions/wpTimezoneChoiceUsortCallback.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsWpTimezoneChoiceUsortCallbackphp">trunk/tests/phpunit/tests/functions/WpTimezoneChoiceUsortCallback.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsWpTimezoneChoiceUsortCallbackphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/functions/WpTimezoneChoiceUsortCallback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/WpTimezoneChoiceUsortCallback.php 2023-11-29 17:31:44 UTC (rev 57145)
+++ trunk/tests/phpunit/tests/functions/WpTimezoneChoiceUsortCallback.php 2023-11-30 11:15:34 UTC (rev 57146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,648 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Tests for the _wp_timezone_choice_usort_callback function.
- *
- * @group Functions.php
- *
- * @covers ::_wp_timezone_choice_usort_callback
- */
-class Tests_Functions_WpTimezoneChoiceUsortCallback extends WP_UnitTestCase {
-
- /**
- * @ticket 59953
- *
- * @dataProvider wp_timezone_choice_usort_callback_data
- */
- public function test__wp_timezone_choice_usort_callback( $unsorted, $sorted, $info ) {
-
- usort( $unsorted, '_wp_timezone_choice_usort_callback' );
-
- $this->assertEquals( $sorted, $unsorted, $info );
- }
-
-
- public function wp_timezone_choice_usort_callback_data() {
- return array(
- array(
- 'unsorted' => array(
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+a',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+b',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+c',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+e',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+d',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+e',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+d',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+c',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+b',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+a',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: just GMT+',
- ),
-
- array(
- 'unsorted' => array(
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+a',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'UTC',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+c',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'UTC',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+d',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+d',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+c',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'GMT+a',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'UTC',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'UTC',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: MIXED utc and GMT',
- ),
-
- array(
- 'unsorted' => array(
- array(
- 'continent' => 'Etc',
- 'city' => 'a',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'e',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'b',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'd',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'c',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => 'Etc',
- 'city' => 'a',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'b',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'c',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'd',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => 'e',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: just alpha city',
- ),
-
- array(
- 'unsorted' => array(
- array(
- 'continent' => 'd',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'c',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'a',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'd',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'e',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => 'd',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'c',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'a',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'd',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'e',
- 'city' => '',
- 't_continent' => '',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: not Etc continent are not sorted',
- ),
- array(
- 'unsorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'd',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'b',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'e',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'c',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'b',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'c',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'd',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'e',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: not Etc just t_city',
- ),
- array(
- 'unsorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'd',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'e',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'c',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'b',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'b',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'c',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'd',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'e',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: not Etc just t_city',
- ),
- array(
- 'unsorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'b',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'e',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'a',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'c',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'd',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'a',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'b',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'c',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'd',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => 'a',
- 't_subcity' => 'e',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: just sub city',
- ),
- array(
- 'unsorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'b',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'c',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => '',
- 't_continent' => '1',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'd',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'sorted' => array(
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'a',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'b',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'c',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => '',
- 'city' => '',
- 't_continent' => 'd',
- 't_city' => '',
- 't_subcity' => '',
- ),
- array(
- 'continent' => 'Etc',
- 'city' => '',
- 't_continent' => '1',
- 't_city' => '',
- 't_subcity' => '',
- ),
- ),
- 'info' => '_wp_timezone_choice_usort_callback: just continent with etc which pulls 1 to bottom',
- ),
- );
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpTimezoneChoiceUsortCallbackphpfromrev57145trunktestsphpunittestsfunctionsWpTimezoneChoiceUsortCallbackphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/functions/wpTimezoneChoiceUsortCallback.php (from rev 57145, trunk/tests/phpunit/tests/functions/WpTimezoneChoiceUsortCallback.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpTimezoneChoiceUsortCallback.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/wpTimezoneChoiceUsortCallback.php 2023-11-30 11:15:34 UTC (rev 57146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,642 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Tests for the _wp_timezone_choice_usort_callback() function.
+ *
+ * @group function
+ *
+ * @covers ::_wp_timezone_choice_usort_callback
+ */
+class Tests_Functions_WpTimezoneChoiceUsortCallback extends WP_UnitTestCase {
+
+ /**
+ * @ticket 59953
+ *
+ * @dataProvider data_wp_timezone_choice_usort_callback
+ */
+ public function test_wp_timezone_choice_usort_callback( $unsorted, $sorted ) {
+ usort( $unsorted, '_wp_timezone_choice_usort_callback' );
+
+ $this->assertSame( $sorted, $unsorted );
+ }
+
+ public function data_wp_timezone_choice_usort_callback() {
+ return array(
+ 'just GMT+' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+a',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+b',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+c',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+e',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+d',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+e',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+d',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+c',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+b',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+a',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+
+ 'mixed UTC and GMT' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+a',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'UTC',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+c',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'UTC',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+d',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+d',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+c',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'GMT+a',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'UTC',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'UTC',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+
+ 'just alpha city' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'a',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'e',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'b',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'd',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'c',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'a',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'b',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'c',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'd',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => 'e',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+
+ 'not Etc continents are not sorted' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => 'd',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'c',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'a',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'd',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'e',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => 'd',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'c',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'a',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'd',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'e',
+ 'city' => '',
+ 't_continent' => '',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+
+ 'not Etc just t_continent' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'd',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'b',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'e',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'c',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'b',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'c',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'd',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'e',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+
+ 'not Etc just t_city' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'd',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'e',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'c',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'b',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'b',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'c',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'd',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'e',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+
+ 'not Etc just t_subcity' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'b',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'e',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'a',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'c',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'd',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'a',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'b',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'c',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'd',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => 'a',
+ 't_subcity' => 'e',
+ ),
+ ),
+ ),
+
+ 'just continent with Etc which pulls 1 to bottom' => array(
+ 'unsorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'b',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'c',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => '',
+ 't_continent' => '1',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'd',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ 'sorted' => array(
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'a',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'b',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'c',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => '',
+ 'city' => '',
+ 't_continent' => 'd',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ array(
+ 'continent' => 'Etc',
+ 'city' => '',
+ 't_continent' => '1',
+ 't_city' => '',
+ 't_subcity' => '',
+ ),
+ ),
+ ),
+ );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>