Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
— | — | @@ -4,7 +4,7 @@ |
5 | 5 | * @group Database |
6 | 6 | */ |
7 | 7 | class NewParserTest extends MediaWikiTestCase { |
8 | | - |
| 8 | + |
9 | 9 | public $uploadDir; |
10 | 10 | public $keepUploads = false; |
11 | 11 | public $runDisabled = false; |
— | — | @@ -15,16 +15,14 @@ |
16 | 16 | public $savedGlobals = array(); |
17 | 17 | public $hooks = array(); |
18 | 18 | public $functionHooks = array(); |
19 | | - |
| 19 | + |
20 | 20 | //Fuzz test |
21 | 21 | public $maxFuzzTestLength = 300; |
22 | 22 | public $fuzzSeed = 0; |
23 | 23 | public $memoryLimit = 50; |
24 | | - |
25 | | - |
26 | | - |
| 24 | + |
27 | 25 | //PHPUnit + MediaWikiTestCase functions |
28 | | - |
| 26 | + |
29 | 27 | function setUp() { |
30 | 28 | global $wgContLang, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgNamespaceProtection, $wgNamespaceAliases, $IP, $messageMemc; |
31 | 29 | $wgContLang = Language::factory( 'en' ); |
— | — | @@ -619,13 +617,7 @@ |
620 | 618 | |
621 | 619 | return $parser; |
622 | 620 | } |
623 | | - |
624 | | - |
625 | | - |
626 | | - |
627 | | - |
628 | | - |
629 | | - |
| 621 | + |
630 | 622 | //Various action functions |
631 | 623 | |
632 | 624 | /** |
— | — | @@ -684,11 +676,7 @@ |
685 | 677 | |
686 | 678 | return true; |
687 | 679 | } |
688 | | - |
689 | | - |
690 | | - |
691 | | - |
692 | | - |
| 680 | + |
693 | 681 | //Various "cleanup" functions |
694 | 682 | |
695 | 683 | /* |
— | — | @@ -720,12 +708,7 @@ |
721 | 709 | return $s; |
722 | 710 | } |
723 | 711 | } |
724 | | - |
725 | | - |
726 | | - |
727 | | - |
728 | | - |
729 | | - |
| 712 | + |
730 | 713 | //Test options parser functions |
731 | 714 | |
732 | 715 | protected function parseOptions( $instring ) { |
— | — | @@ -810,4 +793,3 @@ |
811 | 794 | } |
812 | 795 | } |
813 | 796 | } |
814 | | - |