Renaming SpecialRecentchangesTest file to match conventions
authorKrinkle <krinkle@users.mediawiki.org>
Wed, 14 Sep 2011 01:37:13 +0000 (01:37 +0000)
committerKrinkle <krinkle@users.mediawiki.org>
Wed, 14 Sep 2011 01:37:13 +0000 (01:37 +0000)
* There should be no two files with the same name
* Test suite files should be named after the main file containing the code being tested followed by "Test"

tests/phpunit/includes/specials/SpecialRecentchanges.php [deleted file]
tests/phpunit/includes/specials/SpecialRecentchangesTest.php [new file with mode: 0644]

diff --git a/tests/phpunit/includes/specials/SpecialRecentchanges.php b/tests/phpunit/includes/specials/SpecialRecentchanges.php
deleted file mode 100644 (file)
index a0b6e0d..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Test class for SpecialRecentchanges class
- *
- * Copyright © 2011, Ashar Voultoiz
- *
- * @author Ashar Voultoiz
- */
-class SpecialRecentchangesTest extends MediaWikiTestCase {
-
-       /**
-        * @var SpecialRecentChanges
-        */
-       protected $rc;
-
-       function setUp() {
-       }
-
-       /** helper to test SpecialRecentchanges::buildMainQueryConds() */
-       private function assertConditions( $expected, $requestOptions = null, $message = '' ) {
-               $context = new RequestContext;
-               $context->setRequest( new FauxRequest( $requestOptions ) );
-
-               # setup the rc object
-               $this->rc = new SpecialRecentChanges();
-               $this->rc->setContext( $context );
-               $formOptions = $this->rc->setup( null );
-
-               # Filter out rc_timestamp conditions which depends on the test runtime
-               # This condition is not needed as of march 2, 2011 -- hashar
-               # @todo FIXME: Find a way to generate the correct rc_timestamp
-               $queryConditions = array_filter(
-                       $this->rc->buildMainQueryConds( $formOptions ),
-                       'SpecialRecentchangesTest::filterOutRcTimestampCondition'
-               );
-
-               $this->assertEquals(
-                       $expected,
-                       $queryConditions,
-                       $message
-               );
-       }
-
-       /** return false if condition begin with 'rc_timestamp ' */
-       private static function filterOutRcTimestampCondition( $var ) {
-               return (false === strpos( $var, 'rc_timestamp ' ));
-
-       }
-
-       public function testRcNsFilter() {
-               $this->assertConditions(
-                       array( # expected
-                               'rc_bot' => 0,
-                               #0 => "rc_timestamp >= '20110223000000'",
-                               1 => "rc_namespace = '0'",
-                       ),
-                       array(
-                               'namespace' => NS_MAIN,
-                       ),
-                       "rc conditions with no options (aka default setting)"
-               );
-       }
-
-       public function testRcNsFilterInversion() {
-               $this->assertConditions(
-                       array( # expected
-                               #0 => "rc_timestamp >= '20110223000000'",
-                               'rc_bot' => 0,
-                               1 => sprintf( "rc_namespace != '%s'", NS_MAIN ),
-                       ),
-                       array(
-                               'namespace' => NS_MAIN,
-                               'invert' => 1,
-                       ),
-                 "rc conditions with namespace inverted"
-               );
-       }
-
-       /**
-        * @bug 2429
-        * @dataProvider provideNamespacesAssociations
-        */
-       public function testRcNsFilterAssociation( $ns1, $ns2 ) {
-               $this->assertConditions(
-                       array( # expected
-                               #0 => "rc_timestamp >= '20110223000000'",
-                               'rc_bot' => 0,
-                               1 => sprintf( "rc_namespace IN ('%s','%s')", $ns1, $ns2 ),
-                       ),
-                       array(
-                               'namespace' => $ns1,
-                               'associated' => 1,
-                       ),
-                 "rc conditions with namespace inverted"
-               );
-       }
-
-       /**
-        * @bug 2429
-        * @dataProvider provideNamespacesAssociations
-        */
-       public function testRcNsFilterAssociationWithInversion( $ns1, $ns2 ) {
-               $this->assertConditions(
-                       array( # expected
-                               #0 => "rc_timestamp >= '20110223000000'",
-                               'rc_bot' => 0,
-                               1 => sprintf( "rc_namespace NOT IN ('%s','%s')", $ns1, $ns2 ),
-                       ),
-                       array(
-                               'namespace'  => $ns1,
-                               'associated' => 1,
-                               'invert'     => 1,
-                       ),
-                 "rc conditions with namespace inverted"
-               );
-       }
-
-       /**
-        * Provides associated namespaces to test recent changes
-        * namespaces association filtering.
-        */
-       public function provideNamespacesAssociations() {
-               return array( # (NS => Associated_NS)
-                       array( NS_MAIN, NS_TALK),
-                       array( NS_TALK, NS_MAIN),
-               );
-       }
-
-}
-
-
diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
new file mode 100644 (file)
index 0000000..a0b6e0d
--- /dev/null
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Test class for SpecialRecentchanges class
+ *
+ * Copyright © 2011, Ashar Voultoiz
+ *
+ * @author Ashar Voultoiz
+ */
+class SpecialRecentchangesTest extends MediaWikiTestCase {
+
+       /**
+        * @var SpecialRecentChanges
+        */
+       protected $rc;
+
+       function setUp() {
+       }
+
+       /** helper to test SpecialRecentchanges::buildMainQueryConds() */
+       private function assertConditions( $expected, $requestOptions = null, $message = '' ) {
+               $context = new RequestContext;
+               $context->setRequest( new FauxRequest( $requestOptions ) );
+
+               # setup the rc object
+               $this->rc = new SpecialRecentChanges();
+               $this->rc->setContext( $context );
+               $formOptions = $this->rc->setup( null );
+
+               # Filter out rc_timestamp conditions which depends on the test runtime
+               # This condition is not needed as of march 2, 2011 -- hashar
+               # @todo FIXME: Find a way to generate the correct rc_timestamp
+               $queryConditions = array_filter(
+                       $this->rc->buildMainQueryConds( $formOptions ),
+                       'SpecialRecentchangesTest::filterOutRcTimestampCondition'
+               );
+
+               $this->assertEquals(
+                       $expected,
+                       $queryConditions,
+                       $message
+               );
+       }
+
+       /** return false if condition begin with 'rc_timestamp ' */
+       private static function filterOutRcTimestampCondition( $var ) {
+               return (false === strpos( $var, 'rc_timestamp ' ));
+
+       }
+
+       public function testRcNsFilter() {
+               $this->assertConditions(
+                       array( # expected
+                               'rc_bot' => 0,
+                               #0 => "rc_timestamp >= '20110223000000'",
+                               1 => "rc_namespace = '0'",
+                       ),
+                       array(
+                               'namespace' => NS_MAIN,
+                       ),
+                       "rc conditions with no options (aka default setting)"
+               );
+       }
+
+       public function testRcNsFilterInversion() {
+               $this->assertConditions(
+                       array( # expected
+                               #0 => "rc_timestamp >= '20110223000000'",
+                               'rc_bot' => 0,
+                               1 => sprintf( "rc_namespace != '%s'", NS_MAIN ),
+                       ),
+                       array(
+                               'namespace' => NS_MAIN,
+                               'invert' => 1,
+                       ),
+                 "rc conditions with namespace inverted"
+               );
+       }
+
+       /**
+        * @bug 2429
+        * @dataProvider provideNamespacesAssociations
+        */
+       public function testRcNsFilterAssociation( $ns1, $ns2 ) {
+               $this->assertConditions(
+                       array( # expected
+                               #0 => "rc_timestamp >= '20110223000000'",
+                               'rc_bot' => 0,
+                               1 => sprintf( "rc_namespace IN ('%s','%s')", $ns1, $ns2 ),
+                       ),
+                       array(
+                               'namespace' => $ns1,
+                               'associated' => 1,
+                       ),
+                 "rc conditions with namespace inverted"
+               );
+       }
+
+       /**
+        * @bug 2429
+        * @dataProvider provideNamespacesAssociations
+        */
+       public function testRcNsFilterAssociationWithInversion( $ns1, $ns2 ) {
+               $this->assertConditions(
+                       array( # expected
+                               #0 => "rc_timestamp >= '20110223000000'",
+                               'rc_bot' => 0,
+                               1 => sprintf( "rc_namespace NOT IN ('%s','%s')", $ns1, $ns2 ),
+                       ),
+                       array(
+                               'namespace'  => $ns1,
+                               'associated' => 1,
+                               'invert'     => 1,
+                       ),
+                 "rc conditions with namespace inverted"
+               );
+       }
+
+       /**
+        * Provides associated namespaces to test recent changes
+        * namespaces association filtering.
+        */
+       public function provideNamespacesAssociations() {
+               return array( # (NS => Associated_NS)
+                       array( NS_MAIN, NS_TALK),
+                       array( NS_TALK, NS_MAIN),
+               );
+       }
+
+}
+
+