Commit eaee4510 authored by jhodgdon's avatar jhodgdon
Browse files

Issue #1798390 by Lars Toomre: Remove t() from test assertions in xmlrpc module

parent 207f6d7b
...@@ -64,7 +64,7 @@ protected function testMethodSignature() { ...@@ -64,7 +64,7 @@ protected function testMethodSignature() {
$url = url('xmlrpc.php', array('absolute' => TRUE)); $url = url('xmlrpc.php', array('absolute' => TRUE));
$signature = xmlrpc($url, array('system.methodSignature' => array('system.listMethods'))); $signature = xmlrpc($url, array('system.methodSignature' => array('system.listMethods')));
$this->assert(is_array($signature) && !empty($signature) && is_array($signature[0]), $this->assert(is_array($signature) && !empty($signature) && is_array($signature[0]),
t('system.methodSignature returns an array of signature arrays.')); 'system.methodSignature returns an array of signature arrays.');
} }
/** /**
...@@ -74,19 +74,19 @@ protected function testInvalidMessageParsing() { ...@@ -74,19 +74,19 @@ protected function testInvalidMessageParsing() {
$invalid_messages = array( $invalid_messages = array(
array( array(
'message' => xmlrpc_message(''), 'message' => xmlrpc_message(''),
'assertion' => t('Empty message correctly rejected during parsing.'), 'assertion' => 'Empty message correctly rejected during parsing.',
), ),
array( array(
'message' => xmlrpc_message('<?xml version="1.0" encoding="ISO-8859-1"?>'), 'message' => xmlrpc_message('<?xml version="1.0" encoding="ISO-8859-1"?>'),
'assertion' => t('Empty message with XML declaration correctly rejected during parsing.'), 'assertion' => 'Empty message with XML declaration correctly rejected during parsing.',
), ),
array( array(
'message' => xmlrpc_message('<?xml version="1.0"?><params><param><value><string>value</string></value></param></params>'), 'message' => xmlrpc_message('<?xml version="1.0"?><params><param><value><string>value</string></value></param></params>'),
'assertion' => t('Non-empty message without a valid message type is rejected during parsing.'), 'assertion' => 'Non-empty message without a valid message type is rejected during parsing.',
), ),
array( array(
'message' => xmlrpc_message('<methodResponse><params><param><value><string>value</string></value></param></methodResponse>'), 'message' => xmlrpc_message('<methodResponse><params><param><value><string>value</string></value></param></methodResponse>'),
'assertion' => t('Non-empty malformed message is rejected during parsing.'), 'assertion' => 'Non-empty malformed message is rejected during parsing.',
), ),
); );
......
...@@ -39,7 +39,7 @@ function testSizedMessages() { ...@@ -39,7 +39,7 @@ function testSizedMessages() {
$xml_message_l = xmlrpc_test_message_sized_in_kb($size); $xml_message_l = xmlrpc_test_message_sized_in_kb($size);
$xml_message_r = xmlrpc($xml_url, array('messages.messageSizedInKB' => array($size))); $xml_message_r = xmlrpc($xml_url, array('messages.messageSizedInKB' => array($size)));
$this->assertEqual($xml_message_l, $xml_message_r, t('XML-RPC messages.messageSizedInKB of %s Kb size received', array('%s' => $size))); $this->assertEqual($xml_message_l, $xml_message_r, format_string('XML-RPC messages.messageSizedInKB of %s Kb size received', array('%s' => $size)));
} }
} }
...@@ -57,9 +57,9 @@ protected function testAlterListMethods() { ...@@ -57,9 +57,9 @@ protected function testAlterListMethods() {
$methods2 = xmlrpc($url, array('system.listMethods' => array())); $methods2 = xmlrpc($url, array('system.listMethods' => array()));
$diff = array_diff($methods1, $methods2); $diff = array_diff($methods1, $methods2);
$this->assertTrue(is_array($diff) && !empty($diff), t('Method list is altered by hook_xmlrpc_alter')); $this->assertTrue(is_array($diff) && !empty($diff), 'Method list is altered by hook_xmlrpc_alter');
$removed = reset($diff); $removed = reset($diff);
$this->assertEqual($removed, 'system.methodSignature', t('Hiding builting system.methodSignature with hook_xmlrpc_alter works')); $this->assertEqual($removed, 'system.methodSignature', 'Hiding builting system.methodSignature with hook_xmlrpc_alter works');
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment