Merge "Code style cleanups to parserTest.inc and NewParserTest.php."

diff --combined tests/parser/parserTest.inc
index b501296,3ca28c6..92c03cd
--- 1/tests/parser/parserTest.inc
--- 2/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@@ -434,12 -434,7 +434,12 @@@ class ParserTest 
         */
        public function runTestsFromFiles( $filenames ) {
                $ok = false;
 +
 +              // be sure, ParserTest::addArticle has correct language set,
 +              // so that system messages gets into the right language cache
 +              $GLOBALS['wgLanguageCode'] = 'en';
                $GLOBALS['wgContLang'] = Language::factory( 'en' );
 +
                $this->recorder->start();
                try {
                        $this->setupDatabase();
@@@ -890,7 -885,8 +890,8 @@@
                }
  
                # Update certain things in site_stats
-               $this->db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ) );
+               $this->db->insert( 'site_stats',
+                       array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ) );
  
                # Reinitialise the LocalisationCache to match the database state
                Language::getLocalisationCache()->unloadAll();
@@@ -987,8 -983,11 +988,11 @@@
                $tables = $this->listTables();
  
                foreach ( $tables as $table ) {
-                       $sql = $this->db->getType() == 'oracle' ? "DROP TABLE pt_$table DROP CONSTRAINTS" : "DROP TABLE `parsertest_$table`";
-                       $this->db->query( $sql );
+                       if ( $this->db->getType() == 'oracle' ) {
+                               $this->db->query( "DROP TABLE pt_$table DROP CONSTRAINTS" );
+                       } else {
+                               $this->db->query( "DROP TABLE `parsertest_$table`" );
+                       }
                }
  
                if ( $this->db->getType() == 'oracle' ) {
@@@ -1215,7 -1214,9 +1219,9 @@@
         * @param $outFileTail String: tailing for the output file name
         * @return String
         */
-       protected function quickDiff( $input, $output, $inFileTail = 'expected', $outFileTail = 'actual' ) {
+       protected function quickDiff( $input, $output,
+               $inFileTail = 'expected', $outFileTail = 'actual'
+       ) {
                # Windows, or at least the fc utility, is retarded
                $slash = wfIsWindows() ? '\\' : '/';
                $prefix = wfTempDir() . "{$slash}mwParser-" . mt_rand();