diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php index 304ef78..46e6e1c 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php @@ -107,28 +107,28 @@ function testLanguageConfigurationWeight() { // User to add and remove language. $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); $this->drupalLogin($admin_user); - $this->assertTrue(self::hasLowWeight(), 'System languages has low weight by default'); + $this->assertTrue($this->hasHighWeight(), 'System languages has low weight by default'); // Add predefined language. $edit = array( 'predefined_langcode' => 'fr', ); $this->drupalPost('admin/config/regional/language/add', $edit, 'Add language'); - $this->assertTrue(self::hasLowWeight(), 'System languages has low weight after adding new language'); + $this->assertTrue($this->hasHighWeight(), 'System languages has high weight after adding new language'); // Re-ordering languages. $edit = array( - 'languages[en][weight]' => $this->getLowWeight() - 1, + 'languages[en][weight]' => $this->getHighWeight() + 1, ); $this->drupalPost('admin/config/regional/language', $edit, 'Save configuration'); - $this->assertTrue(self::hasLowWeight(), 'System languages has low weight after re-orderng languages'); + $this->assertTrue($this->hasHighWeight(), 'System languages has high weight after re-ordering languages'); // Remove predefined language. $edit = array( 'confirm' => 1, ); $this->drupalPost('admin/config/regional/language/delete/fr', $edit, 'Delete'); - $this->assertTrue(self::hasLowWeight(), 'System languages has low weight after deleting a language'); + $this->assertTrue($this->hasHighWeight(), 'System languages has high weight after deleting a language'); } /** @@ -136,9 +136,9 @@ function testLanguageConfigurationWeight() { * * @return bool */ - protected function hasLowWeight() { + protected function hasHighWeight() { $system_lang_weight = db_query('SELECT weight FROM {language} WHERE locked = 1 limit 1')->fetchField(); - return $system_lang_weight <= $this->getLowWeight(); + return $system_lang_weight >= $this->getHighWeight(); } /** @@ -146,7 +146,7 @@ protected function hasLowWeight() { * * @return int */ - protected function getLowWeight(){ - return db_query('SELECT MIN(weight) FROM {language} WHERE locked = 0')->fetchField(); + protected function getHighWeight(){ + return db_query('SELECT MAX(weight) FROM {language} WHERE locked = 0')->fetchField(); } }