From 0d1995a828dd530092d23ef8a1c5062e080facec Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 9 Aug 2008 12:41:23 +0000 Subject: [PATCH] - Patch #268063 by boombatower, chx, cwgordon7, Damien Tournoud: move includes/tests to simpletest/tests and provide hidden .info propery --- modules/filter/filter.info | 4 +- modules/simpletest/simpletest.module | 4 - modules/simpletest/tests/xmlrpc.test | 128 ++++++++++++++++++++ modules/simpletest/tests/xmlrpc_test.info | 8 ++ modules/simpletest/tests/xmlrpc_test.module | 62 ++++++++++ modules/system/system.admin.inc | 15 ++- 6 files changed, 211 insertions(+), 10 deletions(-) create mode 100644 modules/simpletest/tests/xmlrpc.test create mode 100644 modules/simpletest/tests/xmlrpc_test.info create mode 100644 modules/simpletest/tests/xmlrpc_test.module diff --git a/modules/filter/filter.info b/modules/filter/filter.info index 2c9a8a32bad..b4104e61c63 100644 --- a/modules/filter/filter.info +++ b/modules/filter/filter.info @@ -1,6 +1,6 @@ -; $Id$ +;h $Id$ name = Filter -description = Handles the filtering of content in preparation for display. +description = Filters content in preparation for display. package = Core - required version = VERSION core = 7.x diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index 73a5f82abbf..ae13665cc13 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -420,10 +420,6 @@ function simpletest_get_all_tests() { } } - foreach (file_scan_directory('includes/tests', '\.test$') as $file) { - $files[] = $file->filename; - } - $existing_classes = get_declared_classes(); foreach ($files as $file) { include_once($file); diff --git a/modules/simpletest/tests/xmlrpc.test b/modules/simpletest/tests/xmlrpc.test new file mode 100644 index 00000000000..799f690813c --- /dev/null +++ b/modules/simpletest/tests/xmlrpc.test @@ -0,0 +1,128 @@ + t('XML-RPC validator'), + 'description' => t('See !validator-link.', array('!validator-link' => l('the xmlrpc validator1 specification', 'http://www.xmlrpc.com/validator1Docs'))), + 'group' => t('XML-RPC'), + ); + } + + /** + * Implementation of setUp(). + */ + function setUp() { + parent::setUp('xmlrpc_test'); + } + + /** + * Run validator1 tests. + */ + function testValidator1() { + $xml_url = url(NULL, array('absolute' => TRUE)) . 'xmlrpc.php'; + srand(); + mt_srand(); + + + $array_1 = array(array('curly' => mt_rand(-100,100)), + array('curly' => mt_rand(-100,100)), + array('larry' => mt_rand(-100,100)), + array('larry' => mt_rand(-100,100)), + array('moe' => mt_rand(-100,100)), + array('moe' => mt_rand(-100,100)), + array('larry' => mt_rand(-100,100))); + shuffle($array_1); + $l_res_1 = xmlrpc_test_arrayOfStructsTest($array_1); + $r_res_1 = xmlrpc($xml_url, 'validator1.arrayOfStructsTest', $array_1); + $this->assertIdentical($l_res_1, $r_res_1, 'array of structs test: %s'); + + + $string_2 = 't\'&>>zf"md>yr>xlcev">>uai"np&s>>q\'&b<>"&&&'; + $l_res_2 = xmlrpc_test_countTheEntities($string_2); + $r_res_2 = xmlrpc($xml_url, 'validator1.countTheEntities', $string_2); + $this->assertIdentical($l_res_2, $r_res_2, 'count the entities test: %s'); + + + $struct_3 = array('moe' => mt_rand(-100,100), 'larry' => mt_rand(-100,100), 'curly' => mt_rand(-100,100), 'homer' => mt_rand(-100,100)); + $l_res_3 = xmlrpc_test_easyStructTest($struct_3); + $r_res_3 = xmlrpc($xml_url, 'validator1.easyStructTest', $struct_3); + $this->assertIdentical($l_res_3, $r_res_3, 'easy struct test: %s'); + + + $struct_4 = array('sub1' => array('bar' => 13), + 'sub2' => 14, + 'sub3' => array('foo' => 1, 'baz' => 2), + 'sub4' => array('ss' => array('sss' => array('ssss' => 'sssss')))); + $l_res_4 = xmlrpc_test_echoStructTest($struct_4); + $r_res_4 = xmlrpc($xml_url, 'validator1.echoStructTest', $struct_4); + $this->assertIdentical($l_res_4, $r_res_4, 'echo struct test: %s'); + + $int_5 = mt_rand(-100,100); + $bool_5 = (($int_5 % 2) == 0); + $string_5 = $this->randomName(); + $double_5 = (double)(mt_rand(-1000,1000) / 100); + $time_5 = time(); + $base64_5 = $this->randomName(100); + $l_res_5 = xmlrpc_test_manyTypesTest($int_5, $bool_5, $string_5, $double_5, xmlrpc_date($time_5), $base64_5); + $l_res_5[5] = $l_res_5[5]->data; /* override warpping */ + $r_res_5 = xmlrpc($xml_url, 'validator1.manyTypesTest', $int_5, $bool_5, $string_5, $double_5, xmlrpc_date($time_5), xmlrpc_base64($base64_5)); + /* Contains objects, objects are not equal */ + // See http://drupal.org/node/37766 why this currnetly fails + $this->assertEqual($l_res_5, $r_res_5, 'many types test: %s'); + + + $size = mt_rand(100,200); + $array_6 = array(); + for ($i = 0; $i < $size; $i++) { + $array_6[] = $this->randomName(mt_rand(8,12)); + } + + $l_res_6 = xmlrpc_test_moderateSizeArrayCheck($array_6); + $r_res_6 = xmlrpc($xml_url, 'validator1.moderateSizeArrayCheck', $array_6); + $this->assertIdentical($l_res_6, $r_res_6, 'moderate size array check: %s'); + + + $struct_7 = array(); + for ($y = 2000; $y < 2002; $y++) { + for ($m = 3; $m < 5; $m++) { + for ($d = 1; $d < 6; $d++) { + $ys = (string)$y; + $ms = sprintf('%02d', $m); + $ds = sprintf('%02d', $d); + $struct_7[$ys][$ms][$ds]['moe'] = mt_rand(-100,100); + $struct_7[$ys][$ms][$ds]['larry'] = mt_rand(-100,100); + $struct_7[$ys][$ms][$ds]['curly'] = mt_rand(-100,100); + } + } + } + $l_res_7 = xmlrpc_test_nestedStructTest($struct_7); + $r_res_7 = xmlrpc($xml_url, 'validator1.nestedStructTest', $struct_7); + $this->assertIdentical($l_res_7, $r_res_7, 'nested struct test: %s'); + + + $int_8 = mt_rand(-100,100); + $l_res_8 = xmlrpc_test_simpleStructReturnTest($int_8); + $r_res_8 = xmlrpc($xml_url, 'validator1.simpleStructReturnTest', $int_8); + $this->assertIdentical($l_res_8, $r_res_8, 'nested struct test: %s'); + + /* Now test multicall */ + $x = array(); + $x[] = array('validator1.arrayOfStructsTest', $array_1); + $x[] = array('validator1.countTheEntities', $string_2); + $x[] = array('validator1.easyStructTest', $struct_3); + $x[] = array('validator1.echoStructTest', $struct_4); + $x[] = array('validator1.manyTypesTest', $int_5, $bool_5, $string_5, $double_5, xmlrpc_date($time_5), xmlrpc_base64($base64_5)); + $x[] = array('validator1.moderateSizeArrayCheck', $array_6); + $x[] = array('validator1.nestedStructTest', $struct_7); + $x[] = array('validator1.simpleStructReturnTest', $int_8); + + $a_l_res = array($l_res_1, $l_res_2, $l_res_3, $l_res_4, $l_res_5, $l_res_6, $l_res_7, $l_res_8); + $a_r_res = xmlrpc($xml_url, $x); + $this->assertEqual($a_l_res, $a_r_res, 'multicall equals result'); + } +} diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info new file mode 100644 index 00000000000..3fdffc398d5 --- /dev/null +++ b/modules/simpletest/tests/xmlrpc_test.info @@ -0,0 +1,8 @@ +; $Id$ +name = "XML-RPC Test" +description = "Support module for XML-RPC tests according to the validator1 specification." +package = Testing +version = VERSION +core = 7.x +files[] = xmlrpc_test.module +hidden = TRUE diff --git a/modules/simpletest/tests/xmlrpc_test.module b/modules/simpletest/tests/xmlrpc_test.module new file mode 100644 index 00000000000..3534a726603 --- /dev/null +++ b/modules/simpletest/tests/xmlrpc_test.module @@ -0,0 +1,62 @@ + substr_count($string, '<'), + 'ctRightAngleBrackets' => substr_count($string, '>'), + 'ctAmpersands' => substr_count($string, '&'), + 'ctApostrophes' => substr_count($string, "'"), + 'ctQuotes' => substr_count($string, '"'), + ); +} + +function xmlrpc_test_easyStructTest($array) { + return $array["curly"] + $array["moe"] + $array["larry"]; +} + +function xmlrpc_test_echoStructTest($array) { + return $array; +} + +function xmlrpc_test_manyTypesTest($number, $boolean, $string, $double, $dateTime, $base64) { + $timestamp = mktime($dateTime->hour, $dateTime->minute, $dateTime->second, $dateTime->month, $dateTime->day, $dateTime->year); + return array($number, $boolean, $string, $double, xmlrpc_date($timestamp), xmlrpc_Base64($base64)); +} + +function xmlrpc_test_moderateSizeArrayCheck($array) { + return array_shift($array) . array_pop($array); +} + +function xmlrpc_test_nestedStructTest($array) { + return $array["2000"]["04"]["01"]["larry"] + $array["2000"]["04"]["01"]["moe"] + $array["2000"]["04"]["01"]["curly"]; +} + +function xmlrpc_test_simpleStructReturnTest($number) { + return array("times10" => ($number*10), "times100" => ($number*100), "times1000" => ($number*1000)); +} + +/** + * Implementation of hook_xmlrpc() + */ +function xmlrpc_test_xmlrpc() { + return array( + 'validator1.arrayOfStructsTest' => 'xmlrpc_test_arrayOfStructsTest', + 'validator1.countTheEntities' => 'xmlrpc_test_countTheEntities', + 'validator1.easyStructTest' => 'xmlrpc_test_easyStructTest', + 'validator1.echoStructTest' => 'xmlrpc_test_echoStructTest', + 'validator1.manyTypesTest' => 'xmlrpc_test_manyTypesTest', + 'validator1.moderateSizeArrayCheck' => 'xmlrpc_test_moderateSizeArrayCheck', + 'validator1.nestedStructTest' => 'xmlrpc_test_nestedStructTest', + 'validator1.simpleStructReturnTest' => 'xmlrpc_test_simpleStructReturnTest'); +} diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index a28f9607459..7c1bf0519fa 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -614,6 +614,13 @@ function system_modules($form_state = array()) { // Get current list of modules. $files = module_rebuild_cache(); + // Remove hidden modules from display list. + foreach ($files as $filename => $file) { + if (!empty($file->info['hidden'])) { + unset($files[$filename]); + } + } + uasort($files, 'system_sort_modules_by_info_name'); if (!empty($form_state['storage'])) { @@ -705,7 +712,7 @@ function system_sort_modules_by_info_name($a, $b) { return strcasecmp($a->info['name'], $b->info['name']); } -/** +/** * Build a table row for the system modules page. */ function _system_modules_build_row($info, $extra) { @@ -881,7 +888,7 @@ function system_modules_submit($form, &$form_state) { ); } else { - $dependencies[$name]['dependencies'][$dependency] = $files[$dependency]->info['name']; + $dependencies[$name]['dependencies'][$dependency] = $files[$dependency]->info['name']; } $modules[$dependency] = array('group' => $files[$dependency]->info['package'], 'enabled' => TRUE); } @@ -2092,10 +2099,10 @@ function theme_system_modules_fieldset($form) { // Add the description, along with any dependencies. $description .= drupal_render($module['description']); if ($module['#dependencies']) { - $description .= '
' . t('Depends on: ') . implode(', ', $module['#dependencies']) . '
'; + $description .= '
' . t('Depends on: ') . implode(', ', $module['#dependencies']) . '
'; } if ($module['#dependents']) { - $description .= '
' . t('Required by: ') . implode(', ', $module['#dependents']) . '
'; + $description .= '
' . t('Required by: ') . implode(', ', $module['#dependents']) . '
'; } $row[] = array('data' => $description, 'class' => 'description'); $rows[] = $row;