Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1797372 by chrisjlee, lazysoundsystem, dcam, xjm, Lars Toomre: Remove t() from test assertions in path module

merge-requests/26/head
Jennifer Hodgdon 2013-06-10 07:49:27 -07:00
parent 053a3b0346
commit 36fb9a26d4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/path/path.test
View File

@ -42,12 +42,12 @@ class PathTestCase extends DrupalWebTestCase {
// created. // created.
cache_clear_all('*', 'cache_path', TRUE); cache_clear_all('*', 'cache_path', TRUE);
$this->drupalGet($edit['source']); $this->drupalGet($edit['source']);
$this->assertTrue(cache_get($edit['source'], 'cache_path'), t('Cache entry was created.')); $this->assertTrue(cache_get($edit['source'], 'cache_path'), 'Cache entry was created.');
// Visit the alias for the node and confirm a cache entry is created. // Visit the alias for the node and confirm a cache entry is created.
cache_clear_all('*', 'cache_path', TRUE); cache_clear_all('*', 'cache_path', TRUE);
$this->drupalGet($edit['alias']); $this->drupalGet($edit['alias']);
$this->assertTrue(cache_get($edit['source'], 'cache_path'), t('Cache entry was created.')); $this->assertTrue(cache_get($edit['source'], 'cache_path'), 'Cache entry was created.');
} }
/** /**
@ -334,7 +334,7 @@ class PathLanguageTestCase extends DrupalWebTestCase {
drupal_static_reset('locale_url_outbound_alter'); drupal_static_reset('locale_url_outbound_alter');
$languages = language_list(); $languages = language_list();
$url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->language])); $url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->language]));
$this->assertTrue(strpos($url, $edit['path[alias]']), t('URL contains the path alias.')); $this->assertTrue(strpos($url, $edit['path[alias]']), 'URL contains the path alias.');
// Confirm that the alias works even when changing language negotiation // Confirm that the alias works even when changing language negotiation
// options. Enable User language detection and selection over URL one. // options. Enable User language detection and selection over URL one.
@ -378,23 +378,23 @@ class PathLanguageTestCase extends DrupalWebTestCase {
// situation only aliases in the default language and language neutral ones // situation only aliases in the default language and language neutral ones
// should keep working. // should keep working.
$this->drupalGet($french_alias); $this->drupalGet($french_alias);
$this->assertResponse(404, t('Alias for French translation is unavailable when URL language negotiation is disabled.')); $this->assertResponse(404, 'Alias for French translation is unavailable when URL language negotiation is disabled.');
// drupal_lookup_path() has an internal static cache. Check to see that // drupal_lookup_path() has an internal static cache. Check to see that
// it has the appropriate contents at this point. // it has the appropriate contents at this point.
drupal_lookup_path('wipe'); drupal_lookup_path('wipe');
$french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language); $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language);
$this->assertEqual($french_node_path, 'node/' . $french_node->nid, t('Normal path works.')); $this->assertEqual($french_node_path, 'node/' . $french_node->nid, 'Normal path works.');
// Second call should return the same path. // Second call should return the same path.
$french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language); $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language);
$this->assertEqual($french_node_path, 'node/' . $french_node->nid, t('Normal path is the same.')); $this->assertEqual($french_node_path, 'node/' . $french_node->nid, 'Normal path is the same.');
// Confirm that the alias works. // Confirm that the alias works.
$french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language); $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language);
$this->assertEqual($french_node_alias, $french_alias, t('Alias works.')); $this->assertEqual($french_node_alias, $french_alias, 'Alias works.');
// Second call should return the same alias. // Second call should return the same alias.
$french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language); $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language);
$this->assertEqual($french_node_alias, $french_alias, t('Alias is the same.')); $this->assertEqual($french_node_alias, $french_alias, 'Alias is the same.');
} }
} }