Merge "maintenance: Document secondary purpose of --server"

[lhc/web/wiklou.git] / tests / phpunit / tests / MediaWikiTestCaseSchema2Test.php

diff --git a/tests/phpunit/tests/MediaWikiTestCaseSchema2Test.php b/tests/phpunit/tests/MediaWikiTestCaseSchema2Test.php
index b1c65ee..5464dc4 100644 (file)
--- a/tests/phpunit/tests/MediaWikiTestCaseSchema2Test.php
+++ b/tests/phpunit/tests/MediaWikiTestCaseSchema2Test.php
@@ -10,20 +10,39 @@
  * that any schema modifications have been cleaned up between test cases.
  * As there seems to be no way to force execution order, we currently rely on
  * test classes getting run in anpha-numerical order.
+ * Order is checked by the testMediaWikiTestCaseSchemaTestOrder test in both classes.
  */
 class MediaWikiTestCaseSchema2Test extends MediaWikiTestCase {
 
-       public function testSchemaExtension() {
+       public function testMediaWikiTestCaseSchemaTestOrder() {
+               // The first test must have run before this one
+               $this->assertTrue( MediaWikiTestCaseSchema1Test::$hasRun );
+       }
+
+       public function testCreatedTableWasRemoved() {
                // Make sure MediaWikiTestCaseTestTable created by MediaWikiTestCaseSchema1Test
                // was dropped before executing MediaWikiTestCaseSchema2Test.
                $this->assertFalse( $this->db->tableExists( 'MediaWikiTestCaseTestTable' ) );
        }
 
-       public function testSchemaOverride() {
-               // Make sure imagelinks modified by MediaWikiTestCaseSchema1Test
+       public function testDroppedTableWasRestored() {
+               // Make sure oldimage that was dropped by MediaWikiTestCaseSchema1Test
+               // was restored before executing MediaWikiTestCaseSchema2Test.
+               $this->assertTrue( $this->db->tableExists( 'oldimage' ) );
+       }
+
+       public function testOverridenTableWasRestored() {
+               // Make sure imagelinks overwritten by MediaWikiTestCaseSchema1Test
                // was restored to the original schema before executing MediaWikiTestCaseSchema2Test.
                $this->assertTrue( $this->db->tableExists( 'imagelinks' ) );
-               $this->assertFalse( $this->db->fieldExists( 'imagelinks', 'il_frobniz' ) );
+               $this->assertFalse( $this->db->fieldExists( 'imagelinks', 'il_frobnitz' ) );
+       }
+
+       public function testAlteredTableWasRestored() {
+               // Make sure pagelinks altered by MediaWikiTestCaseSchema1Test
+               // was restored to the original schema before executing MediaWikiTestCaseSchema2Test.
+               $this->assertTrue( $this->db->tableExists( 'pagelinks' ) );
+               $this->assertFalse( $this->db->fieldExists( 'pagelinks', 'pl_frobnitz' ) );
        }
 
 }