Index: modules/simpletest/qunit.php =================================================================== RCS file: modules/simpletest/qunit.php diff -N modules/simpletest/qunit.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/simpletest/qunit.php 6 Sep 2009 19:28:48 -0000 @@ -0,0 +1,18 @@ + $value) { + $_SERVER[$key] = str_replace('modules/simpletest/qunit.php', 'index.php', $value); +} + +$_GET['q'] = 'simpletest/js/run'; + +require_once('./index.php'); Index: modules/simpletest/simpletest.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v retrieving revision 1.71 diff -u -p -r1.71 simpletest.module --- modules/simpletest/simpletest.module 24 Aug 2009 00:14:21 -0000 1.71 +++ modules/simpletest/simpletest.module 6 Sep 2009 19:28:49 -0000 @@ -33,9 +33,26 @@ function simpletest_menu() { 'access arguments' => array('administer unit tests'), 'file' => 'simpletest.pages.inc', ); - $items['admin/config/development/testing/list'] = array( - 'title' => 'List', + $items['admin/config/development/testing/php'] = array( + 'title' => 'PHP', 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10, + ); + $items['admin/config/development/testing/javascript'] = array( + 'title' => 'JavaScript', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('simpletest_test_javascript_confirm'), + 'access arguments' => array('administer unit tests'), + 'type' => MENU_LOCAL_TASK, + 'file' => 'simpletest.pages.inc', + 'weight' => -9, + ); + $items['admin/config/development/testing/javascript/run'] = array( + 'title' => 'JavaScript', + 'page callback' => 'simpletest_test_javascript_run', + 'access arguments' => array('administer unit tests'), + 'type' => MENU_CALLBACK, + 'file' => 'simpletest.pages.inc', ); $items['admin/config/development/testing/settings'] = array( 'title' => 'Settings', @@ -44,6 +61,7 @@ function simpletest_menu() { 'access arguments' => array('administer unit tests'), 'type' => MENU_LOCAL_TASK, 'file' => 'simpletest.pages.inc', + 'weight' => -8, ); $items['admin/config/development/testing/results/%'] = array( 'title' => 'Test result', @@ -54,6 +72,21 @@ function simpletest_menu() { 'type' => MENU_CALLBACK, 'file' => 'simpletest.pages.inc', ); + + $items['simpletest/js/record'] = array( + 'title' => 'Testing', + 'page callback' => 'simpletest_javascript_record', + 'access arguments' => array('administer unit tests'), + 'type' => MENU_CALLBACK, + 'file' => 'simpletest.pages.inc', + ); + $items['simpletest/js/run'] = array( + 'title' => 'Testing', + 'page callback' => 'simpletest_javascript_run', + 'access arguments' => array('administer unit tests'), + 'type' => MENU_CALLBACK, + 'file' => 'simpletest.pages.inc', + ); return $items; } @@ -86,6 +119,26 @@ function simpletest_theme() { } /** + * Implement hook_library(). + */ +function simpletest_library() { + $libraries['qunit'] = array( + 'title' => 'QUnit', + 'website' => 'http://docs.jquery.com/QUnit', + 'version' => 'dev', + 'js' => array( + drupal_get_path('module', 'simpletest') . '/testrunner.js' => array('weight' => -6), + drupal_get_path('module', 'simpletest') . '/test.js' => array('weight' => -5), + ), + 'css' => array( + drupal_get_path('module', 'simpletest') . '/testsuite.css' => array(), + ), + ); + + return $libraries; +} + +/** * Implementation of hook_stream_wrappers(). */ function simpletest_test_stream_wrappers() { Index: modules/simpletest/simpletest.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v retrieving revision 1.15 diff -u -p -r1.15 simpletest.pages.inc --- modules/simpletest/simpletest.pages.inc 22 Aug 2009 14:34:21 -0000 1.15 +++ modules/simpletest/simpletest.pages.inc 6 Sep 2009 19:28:50 -0000 @@ -194,6 +194,97 @@ function simpletest_test_form_submit($fo } /** + * Display a confirm form for running the JavaScript tests. + */ +function simpletest_test_javascript_confirm() { + return confirm_form(array(), t('Are you sure you want to run the JavaScript tests?'), 'admin/config/development/testing', t('The tests may take a long time to complete.'), t('Run tests'), t('Return to list')); +} + +/** + * Submit handler for the confirm form. + */ +function simpletest_test_javascript_confirm_submit($form, &$form_state) { + $form_state['redirect'] = 'admin/config/development/testing/javascript/run'; +} + +/** + * User interface for running all JavaScript tests, which is triggered through + * the addition of an iframe which runs the JavaScript tests in the browser in + * a separate page callback. + * + * @return + * HTML output. + */ +function simpletest_test_javascript_run() { + $test_id = db_insert('simpletest_test_id') + ->useDefaults(array('test_id')) + ->execute(); + + // Store the test ID in the session, so we have access to it when the iframe + // sends the assertions back to us. + $_SESSION['test_id'] = $test_id; + + return '' . t('Running tests...'); +} + +/** + * Runs all the JavaScript tests, this is triggered from qunit.php because if + * we don't have clean URLs enabled and use a Drupal path, QUnit tries to use + * the q GET parameter as a filter for itself. + * + * @return + * None, HTML output is printed directly to the page to circumvent the theme + * layer. + */ +function simpletest_javascript_run() { + drupal_add_library('simpletest', 'qunit'); + $directories = array(); + foreach (module_list() as $module) { + $directory = drupal_get_path('module', $module); + $directories[$module] = $directory; + if (file_exists("$directory/$module.test.js") && is_file("$directory/$module.test.js")) { + drupal_add_js("$directory/$module.test.js"); + } + if (file_exists("$directory/tests") && is_dir("$directory/tests")) { + foreach (file_scan_directory("$directory/tests", '/.*?\.test\.js/') as $file) { + drupal_add_js($file->uri); + } + } + } + drupal_add_js(array('redirect' => url('admin/config/development/testing/results/' . $_SESSION['test_id'], array('absolute' => TRUE))), 'setting'); + drupal_add_js(array('modules' => $directories), 'setting'); + print ' + + ' . drupal_get_title() . '' . + drupal_get_js() . + drupal_get_css() . + ' + +

Drupal JavaScript Test Suite

+ +

+
    + + + + '; +} + +/** + * JavaScript callback to record JavaScript tests to the database. This is + * called once for each JavaScript test. + * + * @return + * None, data is written to the database. + */ +function simpletest_javascript_record() { + foreach ($_POST['assertions'] as $assertion) { + $status = $assertion['status'] == 'true' ? 'pass' : 'fail'; + DrupalTestCase::insertAssert($_SESSION['test_id'], $_POST['name'], $status, $assertion['message']); + } +} + +/** * Test results form for $test_id. */ function simpletest_result_form(&$form_state, $test_id) { @@ -232,9 +323,19 @@ function simpletest_result_form(&$form_s // Cycle through each test group. $header = array(t('Message'), t('Group'), t('Filename'), t('Line'), t('Function'), array('colspan' => 2, 'data' => t('Status'))); $form['result']['results'] = array(); + $javascript_testing = FALSE; foreach ($results as $group => $assertions) { // Create group fieldset with summary information. - $info = call_user_func(array($group, 'getInfo')); + if (class_exists($group)) { + $info = call_user_func(array($group, 'getInfo')); + } + else { + $javascript_testing = TRUE; + $info = array( + 'name' => $group, + 'description' => '', + ); + } $form['result']['results'][$group] = array( '#type' => 'fieldset', '#title' => $info['name'], @@ -282,7 +383,7 @@ function simpletest_result_form(&$form_s $form['result']['summary']['#ok'] = $form['result']['summary']['#fail'] + $form['result']['summary']['#exception'] == 0; // Actions. - $form['#action'] = url('admin/config/development/testing/results/re-run'); + $form['#action'] = $javascript_testing ? url('admin/config/development/testing/javascript/run') : url('admin/config/development/testing/results/re-run'); $form['action'] = array( '#type' => 'fieldset', '#title' => t('Actions'), @@ -298,6 +399,7 @@ function simpletest_result_form(&$form_s 'pass' => t('Pass (@count)', array('@count' => count($filter['pass']))), 'fail' => t('Fail (@count)', array('@count' => count($filter['fail']))), ), + '#access' => !$javascript_testing, ); $form['action']['filter']['#default_value'] = ($filter['fail'] ? 'fail' : 'all'); Index: modules/simpletest/test.js =================================================================== RCS file: modules/simpletest/test.js diff -N modules/simpletest/test.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/simpletest/test.js 6 Sep 2009 19:28:50 -0000 @@ -0,0 +1,87 @@ +// $Id: test.js,v 1.5 2009/09/04 15:05:13 cwgordon7 Exp $ + +(function($) { + +/** + * Provide a Drupal-specific wrapper for the QUnit JavaScript test framework. + */ +Drupal.tests = Drupal.tests || {}; +Drupal.dependencies = Drupal.dependencies || []; +Drupal.testState = 0; + +Drupal.behaviors.runTests = { + attach: function(context, settings) { + var index; + var loaded = 0; + if (Drupal.testState == 0) { + // Note: never register a dependency on drupal.js, it is loaded + // automatically anyway and will send this into an infinite loop. + if (Drupal.dependencies.length == 0) { + Drupal.testState = 2; + } + else { + for (index in Drupal.dependencies) { + Drupal.testState = 1; + $.getScript(Drupal.dependencies[index](settings), function() { + loaded++; + if (loaded == Drupal.dependencies.length) { + Drupal.testState = 2; + } + }); + } + } + } + if (Drupal.testState == 1) { + setTimeout(Drupal.behaviors.runTests.attach, 100); + } + + if (Drupal.testState == 2) { + Drupal.testState = 3; + var iframe = $('#test').get(0); + Drupal.tests.iframe = (iframe.contentWindow || iframe.contentDocument); + if (Drupal.tests.iframe.document) { + Drupal.tests.iframe = Drupal.tests.iframe.document; + } + Drupal.tests.iframe = Drupal.tests.iframe.body; + + for (index in Drupal.tests) { + if (index == 'iframe') { + continue; + } + var testCase = Drupal.tests[index]; + var info = testCase.getInfo(); + module(info.group, testCase); + test(info.name + '' + info.description + '', testCase.test); + $(Drupal.tests.iframe).html(''); + } + + // After we've finished running all of them, they should be on the page, so + // send a post request back to Drupal. + setTimeout(function() { + var sent = 0; + $('#tests').find('> li').each(function() { + data = {}; + data.group = $(this).find('> strong').get(0).innerHTML.match(/(.*) module: /)[1]; + data.name = $(this).find('> strong > span').get(0).innerHTML.match(/(.*)/)[1]; + data.description = $(this).find('> strong > span').get(0).innerHTML.match(/(.*)<\/span>/)[1]; + index = 0; + $(this).find('> ol > li').each(function() { + data['assertions[' + index + '][status]'] = $(this).hasClass('pass'); + data['assertions[' + index + '][message]'] = this.innerHTML; + index++; + }); + $.post(Drupal.settings.basePath + '?q=simpletest/js/record', data, function() { + sent++; + if ($('#tests').find('> li').size() == sent) { + if (parent !== window) { + parent.location.href = Drupal.settings.redirect; + } + } + }); + }); + }, 100); + } + } +}; + +})(jQuery); Index: modules/simpletest/testrunner.js =================================================================== RCS file: modules/simpletest/testrunner.js diff -N modules/simpletest/testrunner.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/simpletest/testrunner.js 6 Sep 2009 19:28:51 -0000 @@ -0,0 +1,803 @@ +/* + * QUnit - jQuery unit testrunner + * + * http://docs.jquery.com/QUnit + * + * Copyright (c) 2008 John Resig, Jörn Zaefferer + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Id: testrunner.js,v 1.3 2009/09/03 12:35:23 cwgordon7 Exp $ + */ + +(function($) { + +// Test for equality any JavaScript type. +// Discussions and reference: http://philrathe.com/articles/equiv +// Test suites: http://philrathe.com/tests/equiv +// Author: Philippe Rathé +var equiv = function () { + + var innerEquiv; // the real equiv function + var callers = []; // stack to decide between skip/abort functions + + + // Determine what is o. + function hoozit(o) { + if (o.constructor === String) { + return "string"; + + } else if (o.constructor === Boolean) { + return "boolean"; + + } else if (o.constructor === Number) { + + if (isNaN(o)) { + return "nan"; + } else { + return "number"; + } + + } else if (typeof o === "undefined") { + return "undefined"; + + // consider: typeof null === object + } else if (o === null) { + return "null"; + + // consider: typeof [] === object + } else if (o instanceof Array) { + return "array"; + + // consider: typeof new Date() === object + } else if (o instanceof Date) { + return "date"; + + // consider: /./ instanceof Object; + // /./ instanceof RegExp; + // typeof /./ === "function"; // => false in IE and Opera, + // true in FF and Safari + } else if (o instanceof RegExp) { + return "regexp"; + + } else if (typeof o === "object") { + return "object"; + + } else if (o instanceof Function) { + return "function"; + } else { + return undefined; + } + } + + // Call the o related callback with the given arguments. + function bindCallbacks(o, callbacks, args) { + var prop = hoozit(o); + if (prop) { + if (hoozit(callbacks[prop]) === "function") { + return callbacks[prop].apply(callbacks, args); + } else { + return callbacks[prop]; // or undefined + } + } + } + + var callbacks = function () { + + // for string, boolean, number and null + function useStrictEquality(b, a) { + if (b instanceof a.constructor || a instanceof b.constructor) { + // to catch short annotaion VS 'new' annotation of a declaration + // e.g. var i = 1; + // var j = new Number(1); + return a == b; + } else { + return a === b; + } + } + + return { + "string": useStrictEquality, + "boolean": useStrictEquality, + "number": useStrictEquality, + "null": useStrictEquality, + "undefined": useStrictEquality, + + "nan": function (b) { + return isNaN(b); + }, + + "date": function (b, a) { + return hoozit(b) === "date" && a.valueOf() === b.valueOf(); + }, + + "regexp": function (b, a) { + return hoozit(b) === "regexp" && + a.source === b.source && // the regex itself + a.global === b.global && // and its modifers (gmi) ... + a.ignoreCase === b.ignoreCase && + a.multiline === b.multiline; + }, + + // - skip when the property is a method of an instance (OOP) + // - abort otherwise, + // initial === would have catch identical references anyway + "function": function () { + var caller = callers[callers.length - 1]; + return caller !== Object && + typeof caller !== "undefined"; + }, + + "array": function (b, a) { + var i; + var len; + + // b could be an object literal here + if ( ! (hoozit(b) === "array")) { + return false; + } + + len = a.length; + if (len !== b.length) { // safe and faster + return false; + } + for (i = 0; i < len; i++) { + if( ! innerEquiv(a[i], b[i])) { + return false; + } + } + return true; + }, + + "object": function (b, a) { + var i; + var eq = true; // unless we can proove it + var aProperties = [], bProperties = []; // collection of strings + + // comparing constructors is more strict than using instanceof + if ( a.constructor !== b.constructor) { + return false; + } + + // stack constructor before traversing properties + callers.push(a.constructor); + + for (i in a) { // be strict: don't ensures hasOwnProperty and go deep + + aProperties.push(i); // collect a's properties + + if ( ! innerEquiv(a[i], b[i])) { + eq = false; + } + } + + callers.pop(); // unstack, we are done + + for (i in b) { + bProperties.push(i); // collect b's properties + } + + // Ensures identical properties name + return eq && innerEquiv(aProperties.sort(), bProperties.sort()); + } + }; + }(); + + innerEquiv = function () { // can take multiple arguments + var args = Array.prototype.slice.apply(arguments); + if (args.length < 2) { + return true; // end transition + } + + return (function (a, b) { + if (a === b) { + return true; // catch the most you can + } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) { + return false; // don't lose time with error prone cases + } else { + return bindCallbacks(a, callbacks, [b, a]); + } + + // apply transition with (1..n) arguments + })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1)); + }; + + return innerEquiv; + +}(); + +var GETParams = $.map( location.search.slice(1).split('&'), decodeURIComponent ), + ngindex = $.inArray("noglobals", GETParams), + noglobals = ngindex !== -1; + +if( noglobals ) + GETParams.splice( ngindex, 1 ); + +var config = { + stats: { + all: 0, + bad: 0 + }, + queue: [], + // block until document ready + blocking: true, + //restrict modules/tests by get parameters + filters: GETParams, + isLocal: !!(window.location.protocol == 'file:') +}; + +// public API as global methods +$.extend(window, { + test: test, + module: module, + expect: expect, + ok: ok, + equals: equals, + start: start, + stop: stop, + reset: reset, + isLocal: config.isLocal, + same: function(a, b, message) { + push(equiv(a, b), a, b, message); + }, + QUnit: { + equiv: equiv, + ok: ok, + done: function(failures, total){}, + log: function(result, message){} + }, + // legacy methods below + isSet: isSet, + isObj: isObj, + compare: function() { + throw "compare is deprecated - use same() instead"; + }, + compare2: function() { + throw "compare2 is deprecated - use same() instead"; + }, + serialArray: function() { + throw "serialArray is deprecated - use jsDump.parse() instead"; + }, + q: q, + t: t, + url: url, + triggerEvent: triggerEvent +}); + +$(window).load(function() { + + if (!$("#header, #banner, #userAgent, #tests").length) { + $('body').prepend( + '

    ' + document.title + '

    ' + + '' + + '

    ' + + '
      ' + ); + } + + $('#userAgent').html(navigator.userAgent); + var head = $('
      ').insertAfter("#userAgent"); + $('').attr("disabled", true).prependTo(head).click(function() { + $('li.pass')[this.checked ? 'hide' : 'show'](); + }); + $('').attr("disabled", true).appendTo(head).click(function() { + $("li.fail:contains('missing test - untested code is broken code')").parent('ol').parent('li.fail')[this.checked ? 'hide' : 'show'](); + }); + $("#filter-missing").after(''); + runTest(); +}); + +function synchronize(callback) { + config.queue.push(callback); + if(!config.blocking) { + process(); + } +} + +function process() { + while(config.queue.length && !config.blocking) { + config.queue.shift()(); + } +} + +function stop(timeout) { + config.blocking = true; + if (timeout) + config.timeout = setTimeout(function() { + QUnit.ok( false, "Test timed out" ); + start(); + }, timeout); +} +function start() { + // A slight delay, to avoid any current callbacks + setTimeout(function() { + if(config.timeout) + clearTimeout(config.timeout); + config.blocking = false; + process(); + }, 13); +} + +function validTest( name ) { + var i = config.filters.length, + run = false; + + if( !i ) + return true; + + while( i-- ){ + var filter = config.filters[i], + not = filter.charAt(0) == '!'; + if( not ) + filter = filter.slice(1); + if( name.indexOf(filter) != -1 ) + return !not; + if( not ) + run = true; + } + return run; +} + +function runTest() { + config.blocking = false; + var started = +new Date; + config.fixture = document.getElementById('main').innerHTML; + config.ajaxSettings = $.ajaxSettings; + synchronize(function() { + $('

      ').html(['Tests completed in ', + +new Date - started, ' milliseconds.
      ', + '', config.stats.all - config.stats.bad, ' tests of ', config.stats.all, ' passed, ', config.stats.bad,' failed.'] + .join('')) + .appendTo("body"); + $("#banner").addClass(config.stats.bad ? "fail" : "pass"); + QUnit.done( config.stats.bad, config.stats.all ); + }); +} + +var pollution; + +function saveGlobal(){ + pollution = [ ]; + + if( noglobals ) + for( var key in window ) + pollution.push(key); +} +function checkPollution( name ){ + var old = pollution; + saveGlobal(); + + if( pollution.length > old.length ){ + ok( false, "Introduced global variable(s): " + diff(old, pollution).join(", ") ); + config.expected++; + } +} + +function diff( clean, dirty ){ + return $.grep( dirty, function(name){ + return $.inArray( name, clean ) == -1; + }); +} + +function test(name, callback) { + if(config.currentModule) + name = config.currentModule + " module: " + name + ""; + var lifecycle = $.extend({ + setup: function() {}, + teardown: function() {} + }, config.moduleLifecycle); + + if ( !validTest(name) ) + return; + + var testEnvironment = {}; + + synchronize(function() { + config.assertions = []; + config.expected = null; + try { + if( !pollution ) + saveGlobal(); + lifecycle.setup.call(testEnvironment); + } catch(e) { + QUnit.ok( false, "Setup failed on " + name + ": " + e.message ); + } + }); + synchronize(function() { + try { + callback.call(testEnvironment); + } catch(e) { + fail("Test " + name + " died, exception and test follows", e, callback); + QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message ); + // else next test will carry the responsibility + saveGlobal(); + } + }); + synchronize(function() { + try { + checkPollution(); + lifecycle.teardown.call(testEnvironment); + } catch(e) { + QUnit.ok( false, "Teardown failed on " + name + ": " + e.message ); + } + }); + synchronize(function() { + try { + reset(); + } catch(e) { + fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset); + } + + if(config.expected && config.expected != config.assertions.length) { + QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" ); + } + + var good = 0, bad = 0; + var ol = $("

        ").hide(); + config.stats.all += config.assertions.length; + for ( var i = 0; i < config.assertions.length; i++ ) { + var assertion = config.assertions[i]; + $("
      1. ").addClass(assertion.result ? "pass" : "fail").text(assertion.message || "(no message)").appendTo(ol); + assertion.result ? good++ : bad++; + } + config.stats.bad += bad; + + var b = $("").html(name + " (" + bad + ", " + good + ", " + config.assertions.length + ")") + .click(function(){ + $(this).next().toggle(); + }) + .dblclick(function(event) { + var target = $(event.target).filter("strong").clone(); + if ( target.length ) { + target.children().remove(); + location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent($.trim(target.text())); + } + }); + + $("
      2. ").addClass(bad ? "fail" : "pass").append(b).append(ol).appendTo("#tests"); + + if(bad) { + $("#filter-pass").attr("disabled", null); + $("#filter-missing").attr("disabled", null); + } + }); +} + +function fail(message, exception, callback) { + if( typeof console != "undefined" && console.error && console.warn ) { + console.error(message); + console.error(exception); + console.warn(callback.toString()); + } else if (window.opera && opera.postError) { + opera.postError(message, exception, callback.toString); + } +} + +// call on start of module test to prepend name to all tests +function module(name, lifecycle) { + config.currentModule = name; + config.moduleLifecycle = lifecycle; +} + +/** + * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through. + */ +function expect(asserts) { + config.expected = asserts; +} + +/** + * Resets the test setup. Useful for tests that modify the DOM. + */ +function reset() { + $("#main").html( config.fixture ); + $.event.global = {}; + $.ajaxSettings = $.extend({}, config.ajaxSettings); +} + +/** + * Asserts true. + * @example ok( $("a").size() > 5, "There must be at least 5 anchors" ); + */ +function ok(a, msg) { + QUnit.log(a, msg); + + config.assertions.push({ + result: !!a, + message: msg + }); +} + +/** + * Asserts that two arrays are the same + */ +function isSet(a, b, msg) { + function serialArray( a ) { + var r = []; + + if ( a && a.length ) + for ( var i = 0; i < a.length; i++ ) { + var str = a[i].nodeName; + if ( str ) { + str = str.toLowerCase(); + if ( a[i].id ) + str += "#" + a[i].id; + } else + str = a[i]; + r.push( str ); + } + + return "[ " + r.join(", ") + " ]"; + } + var ret = true; + if ( a && b && a.length != undefined && a.length == b.length ) { + for ( var i = 0; i < a.length; i++ ) + if ( a[i] != b[i] ) + ret = false; + } else + ret = false; + QUnit.ok( ret, !ret ? (msg + " expected: " + serialArray(b) + " result: " + serialArray(a)) : msg ); +} + +/** + * Asserts that two objects are equivalent + */ +function isObj(a, b, msg) { + var ret = true; + + if ( a && b ) { + for ( var i in a ) + if ( a[i] != b[i] ) + ret = false; + + for ( i in b ) + if ( a[i] != b[i] ) + ret = false; + } else + ret = false; + + QUnit.ok( ret, msg ); +} + +/** + * Returns an array of elements with the given IDs, eg. + * @example q("main", "foo", "bar") + * @result [
        , , ] + */ +function q() { + var r = []; + for ( var i = 0; i < arguments.length; i++ ) + r.push( document.getElementById( arguments[i] ) ); + return r; +} + +/** + * Asserts that a select matches the given IDs + * @example t("Check for something", "//[a]", ["foo", "baar"]); + * @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar' + */ +function t(a,b,c) { + var f = $(b); + var s = ""; + for ( var i = 0; i < f.length; i++ ) + s += (s && ",") + '"' + f[i].id + '"'; + isSet(f, q.apply(q,c), a + " (" + b + ")"); +} + +/** + * Add random number to url to stop IE from caching + * + * @example url("data/test.html") + * @result "data/test.html?10538358428943" + * + * @example url("data/test.php?foo=bar") + * @result "data/test.php?foo=bar&10538358345554" + */ +function url(value) { + return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000); +} + +/** + * Checks that the first two arguments are equal, with an optional message. + * Prints out both actual and expected values. + * + * Prefered to ok( actual == expected, message ) + * + * @example equals( $.format("Received {0} bytes.", 2), "Received 2 bytes." ); + * + * @param Object actual + * @param Object expected + * @param String message (optional) + */ +function equals(actual, expected, message) { + push(expected == actual, actual, expected, message); +} + +function push(result, actual, expected, message) { + message = message || (result ? "okay" : "failed"); + QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + jsDump.parse(expected) + " result: " + jsDump.parse(actual) ); +} + +/** + * Trigger an event on an element. + * + * @example triggerEvent( document.body, "click" ); + * + * @param DOMElement elem + * @param String type + */ +function triggerEvent( elem, type, event ) { + if ( $.browser.mozilla || $.browser.opera ) { + event = document.createEvent("MouseEvents"); + event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView, + 0, 0, 0, 0, 0, false, false, false, false, 0, null); + elem.dispatchEvent( event ); + } else if ( $.browser.msie ) { + elem.fireEvent("on"+type); + } +} + +})(jQuery); + +/** + * jsDump + * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com + * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php) + * Date: 5/15/2008 + * @projectDescription Advanced and extensible data dumping for Javascript. + * @version 1.0.0 + * @author Ariel Flesler + * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html} + */ +(function(){ + function quote( str ){ + return '"' + str.toString().replace(/"/g, '\\"') + '"'; + }; + function literal( o ){ + return o + ''; + }; + function join( pre, arr, post ){ + var s = jsDump.separator(), + base = jsDump.indent(), + inner = jsDump.indent(1); + if( arr.join ) + arr = arr.join( ',' + s + inner ); + if( !arr ) + return pre + post; + return [ pre, inner + arr, base + post ].join(s); + }; + function array( arr ){ + var i = arr.length, ret = Array(i); + this.up(); + while( i-- ) + ret[i] = this.parse( arr[i] ); + this.down(); + return join( '[', ret, ']' ); + }; + + var reName = /^function (\w+)/; + + var jsDump = window.jsDump = { + parse:function( obj, type ){//type is used mostly internally, you can fix a (custom)type in advance + var parser = this.parsers[ type || this.typeOf(obj) ]; + type = typeof parser; + + return type == 'function' ? parser.call( this, obj ) : + type == 'string' ? parser : + this.parsers.error; + }, + typeOf:function( obj ){ + var type = typeof obj, + f = 'function';//we'll use it 3 times, save it + return type != 'object' && type != f ? type : + !obj ? 'null' : + obj.exec ? 'regexp' :// some browsers (FF) consider regexps functions + obj.getHours ? 'date' : + obj.scrollBy ? 'window' : + obj.nodeName == '#document' ? 'document' : + obj.nodeName ? 'node' : + obj.item ? 'nodelist' : // Safari reports nodelists as functions + obj.callee ? 'arguments' : + obj.call || obj.constructor != Array && //an array would also fall on this hack + (obj+'').indexOf(f) != -1 ? f : //IE reports functions like alert, as objects + 'length' in obj ? 'array' : + type; + }, + separator:function(){ + return this.multiline ? this.HTML ? '
        ' : '\n' : this.HTML ? ' ' : ' '; + }, + indent:function( extra ){// extra can be a number, shortcut for increasing-calling-decreasing + if( !this.multiline ) + return ''; + var chr = this.indentChar; + if( this.HTML ) + chr = chr.replace(/\t/g,' ').replace(/ /g,' '); + return Array( this._depth_ + (extra||0) ).join(chr); + }, + up:function( a ){ + this._depth_ += a || 1; + }, + down:function( a ){ + this._depth_ -= a || 1; + }, + setParser:function( name, parser ){ + this.parsers[name] = parser; + }, + // The next 3 are exposed so you can use them + quote:quote, + literal:literal, + join:join, + // + _depth_: 1, + // This is the list of parsers, to modify them, use jsDump.setParser + parsers:{ + window: '[Window]', + document: '[Document]', + error:'[ERROR]', //when no parser is found, shouldn't happen + unknown: '[Unknown]', + 'null':'null', + undefined:'undefined', + 'function':function( fn ){ + var ret = 'function', + name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE + if( name ) + ret += ' ' + name; + ret += '('; + + ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join(''); + return join( ret, this.parse(fn,'functionCode'), '}' ); + }, + array: array, + nodelist: array, + arguments: array, + object:function( map ){ + var ret = [ ]; + this.up(); + for( var key in map ) + ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) ); + this.down(); + return join( '{', ret, '}' ); + }, + node:function( node ){ + var open = this.HTML ? '<' : '<', + close = this.HTML ? '>' : '>'; + + var tag = node.nodeName.toLowerCase(), + ret = open + tag; + + for( var a in this.DOMAttrs ){ + var val = node[this.DOMAttrs[a]]; + if( val ) + ret += ' ' + a + '=' + this.parse( val, 'attribute' ); + } + return ret + close + open + '/' + tag + close; + }, + functionArgs:function( fn ){//function calls it internally, it's the arguments part of the function + var l = fn.length; + if( !l ) return ''; + + var args = Array(l); + while( l-- ) + args[l] = String.fromCharCode(97+l);//97 is 'a' + return ' ' + args.join(', ') + ' '; + }, + key:quote, //object calls it internally, the key part of an item in a map + functionCode:'[code]', //function calls it internally, it's the content of the function + attribute:quote, //node calls it internally, it's an html attribute value + string:quote, + date:quote, + regexp:literal, //regex + number:literal, + 'boolean':literal + }, + DOMAttrs:{//attributes to dump from nodes, name=>realName + id:'id', + name:'name', + 'class':'className' + }, + HTML:false,//if true, entities are escaped ( <, >, \t, space and \n ) + indentChar:' ',//indentation unit + multiline:true //if true, items in a collection, are separated by a \n, else just a space. + }; + +})(); Index: modules/simpletest/testsuite.css =================================================================== RCS file: modules/simpletest/testsuite.css diff -N modules/simpletest/testsuite.css --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/simpletest/testsuite.css 6 Sep 2009 19:28:51 -0000 @@ -0,0 +1,120 @@ +body, div, h1 { font-family: 'trebuchet ms', verdana, arial; margin: 0; padding: 0 } +body {font-size: 10pt; } +h1 { padding: 15px; font-size: large; background-color: #06b; color: white; } +h1 a { color: white; } +h2 { padding: 10px; background-color: #eee; color: black; margin: 0; font-size: small; font-weight: normal } + +.pass { color: green; } +.fail { color: red; } +p.result { margin-left: 1em; } + +#banner { height: 2em; border-bottom: 1px solid white; } +h2.pass { background-color: green; } +h2.fail { background-color: red; } + +div.testrunner-toolbar { background: #eee; border-top: 1px solid black; padding: 10px; } + +ol#tests > li > strong { cursor:pointer; } + +div#fx-tests h4 { + background: red; +} + +div#fx-tests h4.pass { + background: green; +} + +div#fx-tests div.box { + background: red url(data/cow.jpg) no-repeat; + overflow: hidden; + border: 2px solid #000; +} + +div#fx-tests div.overflow { + overflow: visible; +} + +div.inline { + display: inline; +} + +div.autoheight { + height: auto; +} + +div.autowidth { + width: auto; +} + +div.autoopacity { + opacity: auto; +} + +div.largewidth { + width: 100px; +} + +div.largeheight { + height: 100px; +} + +div.largeopacity { + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100); +} + +div.medwidth { + width: 50px; +} + +div.medheight { + height: 50px; +} + +div.medopacity { + opacity: 0.5; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50); +} + +div.nowidth { + width: 0px; +} + +div.noheight { + height: 0px; +} + +div.noopacity { + opacity: 0; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); +} + +div.hidden { + display: none; +} + +div#fx-tests div.widewidth { + background-repeat: repeat-x; +} + +div#fx-tests div.wideheight { + background-repeat: repeat-y; +} + +div#fx-tests div.widewidth.wideheight { + background-repeat: repeat; +} + +div#fx-tests div.noback { + background-image: none; +} + +div.chain, div.chain div { width: 100px; height: 20px; position: relative; float: left; } +div.chain div { position: absolute; top: 0px; left: 0px; } + +div.chain.test { background: red; } +div.chain.test div { background: green; } + +div.chain.out { background: green; } +div.chain.out div { background: red; display: none; } + +div#show-tests * { display: none; } Index: modules/simpletest/tests/drupal.test.js =================================================================== RCS file: modules/simpletest/tests/drupal.test.js diff -N modules/simpletest/tests/drupal.test.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/simpletest/tests/drupal.test.js 6 Sep 2009 19:29:02 -0000 @@ -0,0 +1,136 @@ +// $Id: drupal.test.js,v 1.3 2009/09/04 09:42:20 cwgordon7 Exp $ + +(function($) { + +/** + * Test the Drupal.checkPlain function. + */ +Drupal.tests.checkPlain = { + getInfo: function() { + return { + name: 'Check plain', + description: 'Tests the Drupal.checkPlain() JavaScript function for properly escaping HTML.', + group: 'System' + }; + }, + test: function() { + expect(9); + + // Test basic strings. + equals(Drupal.checkPlain('test'), 'test', Drupal.t("Nothing gets replaced that doesn't need to be replaced with their escaped equivalent.")); + equals(Drupal.checkPlain('"test'), '"test', Drupal.t('Quotes are replaced with their escaped equivalent.')); + equals(Drupal.checkPlain('Test&1'), 'Test&1', Drupal.t('Ampersands are replaced with their escaped equivalent.')); + equals(Drupal.checkPlain('Test>test'), 'Test>test', Drupal.t('Greater-than signs are replaced with their escaped equivalent.')); + equals(Drupal.checkPlain('TestStuff'), '<tagname property="value">Stuff</tagname>', Drupal.t('Full HTML tags are replaced with their escaped equivalent.')); + equals(Drupal.checkPlain('Test "&".'), 'Test "&".', Drupal.t('A string with both quotes and ampersands replaces those entities with their escaped equivalents.')); + } +}; + +/** + * Tests Drupal.t(). + */ +Drupal.tests.t = { + getInfo: function() { + return { + name: Drupal.t('Translation'), + description: Drupal.t('Tests the basic translation functionality of the Drupal.t() function, including the proper handling of variable strings.'), + group: Drupal.t('System') + }; + }, + setup: function() { + this.originalLocale = Drupal.locale; + Drupal.locale = { + 'strings': { + 'Translation 1': '1 noitalsnarT', + 'Translation with a @placeholder': '@placeholder a with Translation', + 'Translation with another %placeholder': '%placeholder in another translation', + 'Literal !placeholder': 'A literal !placeholder', + 'Test unspecified placeholder': 'Unspecified placeholder test' + } + }; + }, + teardown: function() { + Drupal.locale = this.originalLocale; + }, + test: function() { + expect(9); + + var html = 'Apples & Oranges'; + var escaped = '<tag attribute="value">Apples & Oranges</tag>'; + + // Test placeholders. + equals(Drupal.t('Hello world! @html', {'@html': html}), 'Hello world! ' + escaped, Drupal.t('The "@" placeholder escapes the variable.')); + equals(Drupal.t('Hello world! %html', {'%html': html}), 'Hello world! ' + escaped + '', Drupal.t('The "%" placeholder escapes the variable and themes it as a placeholder.')); + equals(Drupal.t('Hello world! !html', {'!html': html}), 'Hello world! ' + html, Drupal.t('The "!" placeholder passes the variable through as-is.')); + equals(Drupal.t('Hello world! html', {'html': html}), 'Hello world! ' + escaped + '', Drupal.t('Other placeholders act as "%" placeholders do.')); + + // Test actual translations. + equals(Drupal.t('Translation 1'), '1 noitalsnarT', Drupal.t('Basic translations work.')); + equals(Drupal.t('Translation with a @placeholder', {'@placeholder': ''}), '<script>alert("xss")</script> a with Translation', Drupal.t('Translations with the "@" placeholder work.')); + equals(Drupal.t('Translation with another %placeholder', {'%placeholder': ''}), '<script>alert("xss")</script> in another translation', Drupal.t('Translations with the "%" placeholder work.')); + equals(Drupal.t('Literal !placeholder', {'!placeholder': ''}), 'A literal ', Drupal.t('Translations with the "!" placeholder work.')); + equals(Drupal.t('Test unspecified placeholder', {'placeholder': ''}), 'Unspecified <script>alert("xss")</script> test', Drupal.t('Translations with unspecified placeholders work.')); + } +}; + +/** + * Tests Drupal.attachBehaviors() and Drupal.detachBehaviors(). + */ +Drupal.tests.behaviors = { + getInfo: function() { + return { + name: 'JavaScript behaviors', + description: 'Tests the functionality of Drupal behaviors to make sure it allows JavaScript files to attach and detach behaviors in different contexts.', + group: 'System' + }; + }, + setup: function() { + this.originalBehaviors = Drupal.behaviors; + var attachIndex = 0; + var detachIndex = 0; + Drupal.behaviors = { + testBehavior: { + attach: function(context, settings) { + attachIndex++; + equals(context, 'Attach context ' + attachIndex, Drupal.t('Attach context matches passed context.')); + equals(settings, 'Attach settings ' + attachIndex, Drupal.t('Attach settings match passed settings.')); + }, + detach: function(context, settings) { + detachIndex++; + equals(context, 'Detach context ' + detachIndex, Drupal.t('Detach context matches passed context.')); + equals(settings, 'Detach settings ' + detachIndex, Drupal.t('Detach settings match passed settings.')); + } + } + }; + }, + teardown: function() { + Drupal.behaviors = this.originalBehaviors; + }, + test: function() { + expect(8); + + // Test attaching behaviors. + Drupal.attachBehaviors('Attach context 1', 'Attach settings 1'); + + // Test attaching behaviors again. + Drupal.attachBehaviors('Attach context 2', 'Attach settings 2'); + + // Test detaching behaviors. + Drupal.detachBehaviors('Detach context 1', 'Detach settings 1'); + + // Try detaching behaviors again. + Drupal.detachBehaviors('Detach context 2', 'Detach settings 2'); + }, + teardown: function() { + Drupal.behaviors = this.originalBehaviors; + } +}; + +})(jQuery);